From 9cf015ee972bb8568f65128fa7b84c12c4a7cfff Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Thu, 1 Oct 2015 23:20:58 +0100 Subject: [PATCH] Cleanup! --- .../api/corporea/ICorporeaRequestor.java | 2 +- .../multiblock/IMultiblockRenderHook.java | 2 +- .../api/lexicon/multiblock/Multiblock.java | 12 +-- .../component/MultiblockComponent.java | 6 +- .../botania/api/subtile/SubTileEntity.java | 4 +- .../api/subtile/SubTileGenerating.java | 18 ++--- .../client/core/handler/HUDHandler.java | 2 +- .../core/handler/MultiblockBlockAccess.java | 14 ++-- .../core/handler/MultiblockRenderHandler.java | 12 +-- .../handler/SubTileRadiusRenderHandler.java | 4 +- .../client/core/proxy/ClientProxy.java | 3 - .../client/gui/bag/ContainerFlowerBag.java | 2 +- .../botania/client/gui/bag/SlotLocked.java | 4 +- .../client/model/ModelTeruTeruBozu.java | 75 +++++++++---------- .../render/block/RenderTeruTeruBozu.java | 1 - .../render/entity/RenderDoppleganger.java | 6 +- .../tile/RenderTileCorporeaCrystalCube.java | 5 +- .../client/render/tile/RenderTilePool.java | 1 - .../render/tile/RenderTileSkullOverride.java | 4 +- .../render/tile/RenderTileTeruTeruBozu.java | 28 +++---- .../render/tile/RenderTileTinyPotato.java | 14 ++-- .../java/vazkii/botania/common/Botania.java | 2 +- .../common/achievement/ModAchievements.java | 18 ++--- .../botania/common/block/BlockCell.java | 2 +- .../common/block/BlockEnchantedSoil.java | 11 ++- .../botania/common/block/BlockGaiaHead.java | 54 +++++++------ .../common/block/BlockLightLauncher.java | 2 +- .../common/block/BlockSparkChanger.java | 6 +- .../common/block/BlockTeruTeruBozu.java | 22 +++--- .../botania/common/block/ModBlocks.java | 8 +- .../botania/common/block/ModFluffBlocks.java | 12 +-- .../corporea/BlockCorporeaCrystalCube.java | 4 +- .../block/corporea/BlockCorporeaRetainer.java | 8 +- .../common/block/decor/BlockPavement.java | 9 --- .../block/decor/panes/BlockAlfglassPane.java | 1 - .../block/decor/panes/BlockBifrostPane.java | 15 ++-- .../block/decor/panes/BlockManaglassPane.java | 1 - .../block/decor/panes/BlockModPane.java | 60 +++++++-------- .../botania/common/block/mana/BlockPool.java | 2 +- .../common/block/mana/BlockTerraPlate.java | 3 +- .../common/block/string/BlockRedString.java | 4 +- .../string/BlockRedStringInterceptor.java | 6 +- .../common/block/subtile/SubTileDecor.java | 4 +- .../subtile/functional/SubTileBubbell.java | 1 - .../subtile/functional/SubTileExoflame.java | 4 +- .../functional/SubTileRannuncarpus.java | 6 +- .../generating/SubTileDandelifeon.java | 19 +++-- .../generating/SubTileHydroangeas.java | 1 - .../generating/SubTilePassiveGenerating.java | 8 -- .../subtile/generating/SubTileThermalily.java | 4 +- .../botania/common/block/tile/TileCell.java | 18 ++--- .../common/block/tile/TileLightRelay.java | 5 +- .../common/block/tile/TileSpecialFlower.java | 4 +- .../common/block/tile/TileTeruTeruBozu.java | 4 +- .../corporea/TileCorporeaCrystalCube.java | 17 ++--- .../tile/corporea/TileCorporeaFunnel.java | 5 +- .../tile/corporea/TileCorporeaIndex.java | 6 +- .../corporea/TileCorporeaInterceptor.java | 4 +- .../tile/corporea/TileCorporeaRetainer.java | 27 ++++--- .../tile/string/TileRedStringContainer.java | 4 +- .../tile/string/TileRedStringInterceptor.java | 16 ++-- .../common/core/BotaniaCreativeTab.java | 16 ++-- .../core/handler/BiomeDecorationHandler.java | 2 +- .../common/core/handler/ConfigHandler.java | 8 +- .../common/core/proxy/CommonProxy.java | 2 +- .../common/crafting/ModCraftingRecipes.java | 30 ++++---- .../common/crafting/ModPetalRecipes.java | 2 +- .../common/entity/EntityPinkWither.java | 2 +- .../common/entity/EntityThornChakram.java | 7 +- .../multipart/MultipartHandler.java | 11 +-- .../common/item/ItemAutocraftingHalo.java | 12 +-- .../common/item/ItemBlackHoleTalisman.java | 4 +- .../botania/common/item/ItemBottledMana.java | 2 +- .../botania/common/item/ItemCraftingHalo.java | 14 ++-- .../botania/common/item/ItemGaiaHead.java | 9 +-- .../botania/common/item/ItemManaGun.java | 2 +- .../vazkii/botania/common/item/ModItems.java | 2 +- .../common/item/brew/ItemBrewBase.java | 2 +- .../item/equipment/bauble/ItemMagnetRing.java | 2 +- .../item/equipment/bauble/ItemMonocle.java | 30 +++----- .../common/item/relic/ItemInfiniteFruit.java | 6 +- .../botania/common/lexicon/LexiconData.java | 13 ++-- .../common/lexicon/page/PageMultiblock.java | 8 +- .../common/lib/LibAchievementNames.java | 2 +- .../vazkii/botania/common/lib/LibLexicon.java | 2 +- 85 files changed, 369 insertions(+), 447 deletions(-) diff --git a/src/main/java/vazkii/botania/api/corporea/ICorporeaRequestor.java b/src/main/java/vazkii/botania/api/corporea/ICorporeaRequestor.java index 7ab5cc1a6..66881b5b3 100644 --- a/src/main/java/vazkii/botania/api/corporea/ICorporeaRequestor.java +++ b/src/main/java/vazkii/botania/api/corporea/ICorporeaRequestor.java @@ -21,5 +21,5 @@ public interface ICorporeaRequestor { * Executes the passed in request. */ public void doCorporeaRequest(Object request, int count, ICorporeaSpark spark); - + } 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 6e044a00f..9d05c40d9 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java @@ -13,10 +13,10 @@ package vazkii.botania.api.lexicon.multiblock; import java.util.HashMap; import java.util.Map; -import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; +import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; /** * 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 188bef3b9..4cf34b858 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java @@ -31,7 +31,7 @@ public class Multiblock { public List materials = new ArrayList(); public int minX, minY, minZ, maxX, maxY, maxZ, offX, offY, offZ; - + public HashMap, MultiblockComponent> locationCache = new HashMap, MultiblockComponent>(); /** @@ -157,7 +157,7 @@ public class Multiblock { public int getZSize() { return Math.abs(minZ) + Math.abs(maxZ) + 1; } - + /** * Rebuilds the location cache */ @@ -166,17 +166,17 @@ public class Multiblock { for(MultiblockComponent comp : components) addComponentToLocationCache(comp); } - + /** * Adds a single component to the location cache */ private void addComponentToLocationCache(MultiblockComponent comp) { ChunkCoordinates pos = comp.getRelativePosition(); locationCache.put(Arrays.asList( - pos.posX, - pos.posY, + pos.posX, + pos.posY, pos.posZ - ), comp); + ), comp); } /** 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 21fbeaa4e..b1a7d895f 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,13 +10,13 @@ */ package vazkii.botania.api.lexicon.multiblock.component; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; 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; /** * A component of a multiblock, the normal one @@ -41,7 +41,7 @@ public class MultiblockComponent { public MultiblockComponent(ChunkCoordinates 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) { this.relPos = relPos; this.block = block; diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index a5af0acc3..da1ce2dc8 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -39,7 +39,7 @@ public class SubTileEntity { protected TileEntity supertile; public int ticksExisted = 0; - + /** true if this flower is working on Enchanted Soil **/ public boolean overgrowth = false; /** true if this flower is working on Enchanted Soil and this is the second tick **/ @@ -218,7 +218,7 @@ public class SubTileEntity { public int getPowerLevel(int side) { return 0; } - + /** * Gets if this SubTileEntity is affected by Enchanted Soil's speed boost. */ diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index 0cabcb68b..fe6336b7e 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -48,7 +48,7 @@ public class SubTileGenerating extends SubTileEntity { private static final String TAG_PASSIVE_DECAY_TICKS = "passiveDecayTicks"; protected int mana; - + public int redstoneSignal = 0; int sizeLastCheck = -1; @@ -64,7 +64,7 @@ public class SubTileGenerating extends SubTileEntity { public boolean acceptsRedstone() { return false; } - + @Override public void onUpdate() { super.onUpdate(); @@ -88,14 +88,14 @@ public class SubTileGenerating extends SubTileEntity { redstoneSignal = Math.max(redstoneSignal, redstoneSide); } } - + if(supertile.getWorldObj().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); } - + boolean passive = isPassiveFlower(); if(!supertile.getWorldObj().isRemote) { int muhBalance = BotaniaAPI.internalHandler.getPassiveFlowerDecay(); @@ -107,7 +107,7 @@ public class SubTileGenerating extends SubTileEntity { else supertile.getWorldObj().setBlockToAir(supertile.xCoord, supertile.yCoord, supertile.zCoord); } } - + if(!overgrowth && passive) passiveDecayTicks++; } @@ -184,7 +184,7 @@ public class SubTileGenerating extends SubTileEntity { public int getValueForPassiveGeneration() { return 1; } - + @Override public ArrayList getDrops(ArrayList list) { ArrayList drops = super.getDrops(list); @@ -235,7 +235,7 @@ public class SubTileGenerating extends SubTileEntity { int x = cmp.getInteger(TAG_COLLECTOR_X); int y = cmp.getInteger(TAG_COLLECTOR_Y); int z = cmp.getInteger(TAG_COLLECTOR_Z); - + cachedCollectorCoordinates = y < 0 ? null : new ChunkCoordinates(x, y, z); } @@ -244,7 +244,7 @@ public class SubTileGenerating extends SubTileEntity { cmp.setInteger(TAG_MANA, mana); cmp.setInteger(TAG_TICKS_EXISTED, ticksExisted); cmp.setInteger(TAG_PASSIVE_DECAY_TICKS, passiveDecayTicks); - + if(cachedCollectorCoordinates != null) { cmp.setInteger(TAG_COLLECTOR_X, cachedCollectorCoordinates.posX); cmp.setInteger(TAG_COLLECTOR_Y, cachedCollectorCoordinates.posY); @@ -300,7 +300,7 @@ public class SubTileGenerating extends SubTileEntity { int color = getColor(); BotaniaAPI.internalHandler.drawComplexManaHUD(color, knownMana, getMaxMana(), name, res, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding()); } - + @Override public boolean isOvergrowthAffected() { return !isPassiveFlower(); 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 3b1ffe69a..23fd4c61c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -145,7 +145,7 @@ public final class HUDHandler { ItemFlugelEye.renderHUD(event.resolution, mc.thePlayer, equippedStack); profiler.endSection(); }*/ - + if(Botania.proxy.isClientPlayerWearingMonocle()) { profiler.startSection("monocle"); ItemMonocle.renderHUD(event.resolution, mc.thePlayer); 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 0bd51a86a..c59ac2505 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java @@ -10,14 +10,14 @@ */ package vazkii.botania.client.core.handler; -import vazkii.botania.api.lexicon.multiblock.Multiblock; -import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; 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; /** * This class acts as a wrapper around a block access to @@ -29,7 +29,7 @@ public class MultiblockBlockAccess implements IBlockAccess { protected boolean hasBlockAccess = false; protected Multiblock multiblock; protected int anchorX, anchorY, anchorZ; - + @Override public Block getBlock(int x, int y, int z) { MultiblockComponent comp=getComponent(x, y, z); @@ -114,14 +114,14 @@ public class MultiblockBlockAccess implements IBlockAccess { * Updates the block access to the new parameters */ public void update(IBlockAccess access, Multiblock mb, int anchorX, int anchorY, int anchorZ) { - this.originalBlockAccess = access; - this.multiblock = mb; + originalBlockAccess = access; + multiblock = mb; this.anchorX = anchorX; this.anchorY = anchorY; this.anchorZ = anchorZ; - this.hasBlockAccess = access != null; + hasBlockAccess = access != null; } - + /** * Returns the multiblock component for the coordinates, adjusted based on the anchor */ 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 55786dc51..f60e46c43 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -142,9 +142,9 @@ public final class MultiblockRenderHandler { else { if(comp.shouldDoFancyRender()) { int color = block.colorMultiplier(blockAccess, x, y, z); - float red = (float)(color >> 16 & 255) / 255.0F; - float green = (float)(color >> 8 & 255) / 255.0F; - float blue = (float)(color & 255) / 255.0F; + 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); IBlockAccess oldBlockAccess = blockRender.blockAccess; blockRender.blockAccess = blockAccess; @@ -164,9 +164,9 @@ public final class MultiblockRenderHandler { } else { int color = block.getRenderColor(meta); - float red = (float)(color >> 16 & 255) / 255.0F; - float green = (float)(color >> 8 & 255) / 255.0F; - float blue = (float)(color & 255) / 255.0F; + 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); blockRender.renderBlockAsItem(block, meta, 1F); 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 620a2cfc9..68460cabf 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java @@ -44,7 +44,7 @@ public final class SubTileRadiusRenderHandler { int x = pos.blockX; int y = pos.blockY; int z = pos.blockZ; - + ItemStack stackHeld = mc.thePlayer.getCurrentEquippedItem(); if(stackHeld != null && stackHeld.getItem() == ModItems.twigWand && ItemTwigWand.getBindMode(stackHeld)) { ChunkCoordinates coords = ItemTwigWand.getBoundTile(stackHeld); @@ -54,7 +54,7 @@ public final class SubTileRadiusRenderHandler { z = coords.posZ; } } - + TileEntity tile = mc.theWorld.getTileEntity(x, y, z); if(tile == null || !(tile instanceof ISubTileContainer)) return; 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 e2b20ebbd..3403b1541 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -32,7 +32,6 @@ import net.minecraft.world.World; import net.minecraft.world.WorldSettings.GameType; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; -import vazkii.botania.api.item.IBurstViewerBauble; import vazkii.botania.api.item.IExtendedPlayerController; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook; @@ -163,8 +162,6 @@ import vazkii.botania.common.entity.EntityVineBall; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.bauble.ItemMonocle; import vazkii.botania.common.lib.LibObfuscation; -import baubles.common.container.InventoryBaubles; -import baubles.common.lib.PlayerHandler; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.FMLCommonHandler; 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 6695d4a9e..6cd2ca8aa 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java @@ -43,7 +43,7 @@ public class ContainerFlowerBag extends Container { addSlotToContainer(new SlotLocked(playerInv, i, 8 + i * 18, 142)); else addSlotToContainer(new Slot(playerInv, i, 8 + i * 18, 142)); } - + } @Override diff --git a/src/main/java/vazkii/botania/client/gui/bag/SlotLocked.java b/src/main/java/vazkii/botania/client/gui/bag/SlotLocked.java index 66962711d..6ba8e937d 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/SlotLocked.java +++ b/src/main/java/vazkii/botania/client/gui/bag/SlotLocked.java @@ -20,12 +20,12 @@ public class SlotLocked extends Slot { public SlotLocked(IInventory 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_); } - + @Override public boolean canTakeStack(EntityPlayer p_82869_1_) { return false; } - + @Override public boolean isItemValid(ItemStack p_75214_1_) { return false; diff --git a/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java b/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java index 7e2a1a545..06817df7c 100644 --- a/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java @@ -13,47 +13,46 @@ 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.entity.Entity; public class ModelTeruTeruBozu extends ModelBase { - - public ModelRenderer thread; - public ModelRenderer cloth; - public ModelRenderer happyFace; - public ModelRenderer sadFace; - public ModelTeruTeruBozu() { - this.textureWidth = 64; - this.textureHeight = 32; - this.sadFace = new ModelRenderer(this, 32, 0); - this.sadFace.setRotationPoint(0.0F, 14.5F, 0.0F); - this.sadFace.addBox(-4.0F, -6.0F, -4.0F, 8, 8, 8, 0.0F); - this.setRotateAngle(sadFace, 0.17453292519943295F, 0.0F, 0.0F); - this.happyFace = new ModelRenderer(this, 0, 0); - this.happyFace.setRotationPoint(0.0F, 14.5F, 0.0F); - this.happyFace.addBox(-4.0F, -6.0F, -4.0F, 8, 8, 8, 0.0F); - this.setRotateAngle(happyFace, -0.17453292519943295F, 0.0F, 0.0F); - this.thread = new ModelRenderer(this, 32, 16); - this.thread.setRotationPoint(0.0F, 14.0F, 0.0F); - this.thread.addBox(-3.0F, 2.0F, -3.0F, 6, 1, 6, 0.0F); - this.cloth = new ModelRenderer(this, 0, 16); - this.cloth.setRotationPoint(0.0F, 21.5F, -1.0F); - this.cloth.addBox(-4.0F, -4.0F, -4.0F, 8, 8, 8, 0.0F); - this.setRotateAngle(cloth, 0.7853981633974483F, 2.2689280275926285F, 1.5707963267948966F); - } + public ModelRenderer thread; + public ModelRenderer cloth; + public ModelRenderer happyFace; + public ModelRenderer sadFace; - public void render() { - float f5 = 1F / 16F; - if(Minecraft.getMinecraft().theWorld.isRaining()) - this.sadFace.render(f5); - else this.happyFace.render(f5); - this.thread.render(f5); - this.cloth.render(f5); - } + public ModelTeruTeruBozu() { + textureWidth = 64; + textureHeight = 32; + sadFace = new ModelRenderer(this, 32, 0); + sadFace.setRotationPoint(0.0F, 14.5F, 0.0F); + sadFace.addBox(-4.0F, -6.0F, -4.0F, 8, 8, 8, 0.0F); + setRotateAngle(sadFace, 0.17453292519943295F, 0.0F, 0.0F); + happyFace = new ModelRenderer(this, 0, 0); + happyFace.setRotationPoint(0.0F, 14.5F, 0.0F); + happyFace.addBox(-4.0F, -6.0F, -4.0F, 8, 8, 8, 0.0F); + setRotateAngle(happyFace, -0.17453292519943295F, 0.0F, 0.0F); + thread = new ModelRenderer(this, 32, 16); + thread.setRotationPoint(0.0F, 14.0F, 0.0F); + thread.addBox(-3.0F, 2.0F, -3.0F, 6, 1, 6, 0.0F); + cloth = new ModelRenderer(this, 0, 16); + cloth.setRotationPoint(0.0F, 21.5F, -1.0F); + cloth.addBox(-4.0F, -4.0F, -4.0F, 8, 8, 8, 0.0F); + setRotateAngle(cloth, 0.7853981633974483F, 2.2689280275926285F, 1.5707963267948966F); + } - public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) { - modelRenderer.rotateAngleX = x; - modelRenderer.rotateAngleY = y; - modelRenderer.rotateAngleZ = z; - } + public void render() { + float f5 = 1F / 16F; + if(Minecraft.getMinecraft().theWorld.isRaining()) + sadFace.render(f5); + else happyFace.render(f5); + thread.render(f5); + cloth.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/render/block/RenderTeruTeruBozu.java b/src/main/java/vazkii/botania/client/render/block/RenderTeruTeruBozu.java index 50568183d..d12f99eaa 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderTeruTeruBozu.java @@ -18,7 +18,6 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; -import vazkii.botania.common.block.tile.TileHourglass; import vazkii.botania.common.block.tile.TileTeruTeruBozu; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; 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 f3d78deba..3b8c124ba 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -25,8 +25,8 @@ 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 float DEFAULT_GRAIN_INTENSITY = 0.05F; + public static float DEFAULT_DISFIGURATION = 0.025F; public static float grainIntensity = DEFAULT_GRAIN_INTENSITY; public static float disfiguration = DEFAULT_DISFIGURATION; @@ -44,7 +44,7 @@ public class RenderDoppleganger extends RenderBiped { ARBShaderObjects.glUniform1fARB(grainIntensityUniform, grainIntensity); } }; - + public static ShaderCallback defaultCallback = new ShaderCallback() { @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 95149dba1..71f7d6eef 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -19,7 +19,6 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -82,10 +81,10 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { String countStr = "" + count; int color = 0xFFFFFF; if(count > 9999) { - countStr = (count / 1000) + "K"; + countStr = count / 1000 + "K"; color = 0xFFFF00; if(count > 9999999) { - countStr = (count / 10000000) + "M"; + countStr = count / 10000000 + "M"; color = 0x00FF00; } } 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 ca840a0a7..5aca76994 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -17,7 +17,6 @@ import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.passive.EntitySheep; -import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; 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 bac4890de..5d49f06fe 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java @@ -80,9 +80,9 @@ public class RenderTileSkullOverride extends TileEntitySkullRenderer { GL11.glEnable(GL11.GL_ALPHA_TEST); if(gaia) ShaderHelper.useShader(ShaderHelper.doppleganger, RenderDoppleganger.defaultCallback); - + modelSkull.render(null, 0F, 0F, 0F, par5, 0F, 0.0625F); - + if(gaia) ShaderHelper.releaseShader(); GL11.glPopMatrix(); 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 c05ffdd35..2c69fcf17 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java @@ -12,20 +12,18 @@ package vazkii.botania.client.render.tile; import java.util.Random; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.client.model.ModelCocoon; -import vazkii.botania.client.model.ModelTeruTeruBozu; -import vazkii.botania.common.Botania; -import vazkii.botania.common.block.tile.TileCocoon; -import vazkii.botania.common.block.tile.TileTeruTeruBozu; import net.minecraft.client.Minecraft; 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.ModelTeruTeruBozu; +import vazkii.botania.common.Botania; + public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TERU_TERU_BOZU); @@ -33,8 +31,6 @@ public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f) { - TileTeruTeruBozu tile = (TileTeruTeruBozu) tileentity; - GL11.glPushMatrix(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); GL11.glEnable(GL11.GL_BLEND); @@ -45,18 +41,18 @@ public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(texture); GL11.glRotatef(180F, 1F, 0F, 0F); double time = Botania.proxy.getWorldElapsedTicks() + f; - boolean hasWorld = tileentity.getWorldObj() != null; + boolean hasWorld = tileentity.getWorldObj() != null; if(hasWorld) time += new Random(tileentity.xCoord ^ tileentity.yCoord ^ tileentity.zCoord).nextInt(1000); - - GL11.glTranslatef(0.5F, -1.25F + (hasWorld ? ((float) Math.sin(time * 0.01F) * 0.05F) : 0F), -0.5F); + + GL11.glTranslatef(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); float s = 0.75F; - GL11.glScalef(s, s, s); + GL11.glScalef(s, s, s); } - + model.render(); GL11.glColor3f(1F, 1F, 1F); GL11.glEnable(GL12.GL_RESCALE_NORMAL); 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 a33bd9084..6854dc38f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -34,11 +34,9 @@ import vazkii.botania.client.core.handler.ContributorFancinessHandler; import vazkii.botania.client.core.helper.ShaderHelper; 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; -import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; import vazkii.botania.common.item.material.ItemManaResource; import vazkii.botania.common.item.relic.ItemInfiniteFruit; @@ -59,7 +57,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { Minecraft mc = Minecraft.getMinecraft(); mc.renderEngine.bindTexture(texture); String name = potato.name.toLowerCase(); - + boolean usedShader = false; if(name.startsWith("gaia ")) { ShaderHelper.useShader(ShaderHelper.doppleganger); @@ -81,7 +79,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { ShaderHelper.useShader(ShaderHelper.terraPlateRune); name = name.substring(6); usedShader = true; - } + } GL11.glTranslatef(0.5F, 1.5F, 0.5F); GL11.glScalef(1F, -1F, -1F); @@ -110,7 +108,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GL11.glTranslatef(0F, -2.625F, 0F); } else if(name.equals("aureylian")) GL11.glColor3f(1F, 0.5F, 1F); - + boolean render = !(name.equals("mami") || name.equals("soaryn") || name.equals("eloraam") && jump != 0); if(render) @@ -122,7 +120,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { if(usedShader) ShaderHelper.releaseShader(); - + GL11.glPopMatrix(); if(!name.isEmpty()) { @@ -295,7 +293,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { renderIcon(ModItems.manaRing.getIconFromDamage(0)); GL11.glTranslatef(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); @@ -327,7 +325,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { } 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); diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 1cc7dcaa8..180a609f7 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -73,7 +73,7 @@ public class Botania { public void postInit(FMLPostInitializationEvent event) { proxy.postInit(event); } - + @EventHandler public void serverStarting(FMLServerAboutToStartEvent event) { proxy.serverAboutToStart(event); diff --git a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java index b12c311e4..9db5d62dd 100644 --- a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java +++ b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java @@ -33,7 +33,7 @@ public final class ModAchievements { public static Achievement daybloomPickup; public static Achievement cacophoniumCraft; public static Achievement manaPoolPickup; - + public static Achievement endoflamePickup; public static Achievement tinyPotatoPet; public static Achievement sparkCraft; @@ -44,32 +44,32 @@ public final class ModAchievements { public static Achievement manaCartCraft; public static Achievement enchanterMake; public static Achievement runePickup; - + public static Achievement dirtRodCraft; public static Achievement terraformRodCraft; public static Achievement manaBlasterShoot; public static Achievement pollidisiacPickup; public static Achievement brewPickup; public static Achievement terrasteelPickup; - + public static Achievement terrasteelWeaponCraft; public static Achievement elfPortalOpen; - + public static Achievement kekimurusPickup; public static Achievement heiseiDreamPickup; public static Achievement bubbellPickup; public static Achievement luminizerRide; - + public static Achievement enderAirMake; public static Achievement corporeaCraft; - + public static Achievement gaiaGuardianKill; - + public static Achievement spawnerMoverUse; public static Achievement tiaraWings; public static Achievement manaBombIgnite; public static Achievement dandelifeonPickup; - + public static Achievement signalFlareStun; public static Achievement l20ShardUse; public static Achievement gaiaGuardianNoArmor; @@ -129,7 +129,7 @@ public final class ModAchievements { tiaraWings = new AchievementMod(LibAchievementNames.TIARA_WINGS, -1, 8, ModItems.flightTiara, gaiaGuardianKill); manaBombIgnite = new AchievementMod(LibAchievementNames.MANA_BOMB_IGNITE, 0, 11, ModBlocks.manaBomb, gaiaGuardianKill); dandelifeonPickup = new AchievementMod(LibAchievementNames.DANDELIFEON_PICKUP, 0, 7, ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DANDELIFEON), gaiaGuardianKill); - + signalFlareStun = new AchievementMod(LibAchievementNames.SIGNAL_FLARE_STUN, -3, 1, ModItems.signalFlare, null).setSpecial(); l20ShardUse = new AchievementMod(LibAchievementNames.L20_SHARD_USE, -5, 3, ModItems.laputaShard, null).setSpecial(); gaiaGuardianNoArmor = new AchievementMod(LibAchievementNames.GAIA_GUARDIAN_NO_ARMOR, -5, 1, new ItemStack(Items.skull, 1, 3), null).setSpecial(); diff --git a/src/main/java/vazkii/botania/common/block/BlockCell.java b/src/main/java/vazkii/botania/common/block/BlockCell.java index d09ad8f94..b538b2372 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCell.java +++ b/src/main/java/vazkii/botania/common/block/BlockCell.java @@ -30,7 +30,7 @@ public class BlockCell extends BlockModContainer implements ILexiconable { setBlockName(LibBlockNames.CELL_BLOCK); setStepSound(soundTypeCloth); } - + @Override public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { return new ArrayList(); diff --git a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java index 7b82070ab..1c66aca3f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java @@ -12,9 +12,6 @@ package vazkii.botania.common.block; import java.util.Random; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -32,10 +29,12 @@ 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.core.helper.IconHelper; 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; public class BlockEnchantedSoil extends BlockMod implements ILexiconable { @@ -59,7 +58,7 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable { public void registerBlockIcons(IIconRegister par1IconRegister) { // NO-OP } - + @SubscribeEvent @SideOnly(Side.CLIENT) public void loadTextures(TextureStitchEvent.Pre event) { @@ -67,7 +66,7 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable { 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; diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index 1b8827357..7d209302e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -15,10 +15,8 @@ import net.minecraft.block.BlockSkull; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntitySkull; import net.minecraft.world.World; import vazkii.botania.common.block.tile.TileGaiaHead; -import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lib.LibBlockNames; @@ -31,37 +29,37 @@ public class BlockGaiaHead extends BlockSkull { public BlockGaiaHead() { setBlockName(LibBlockNames.GAIA_HEAD); } - + @Override public Block setBlockName(String par1Str) { GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); return super.setBlockName(par1Str); } - - @Override - @SideOnly(Side.CLIENT) - public Item getItem(World p_149694_1_, int p_149694_2_, int p_149694_3_, int p_149694_4_) { - 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_) { - return 0; - } + @Override + @SideOnly(Side.CLIENT) + public Item getItem(World p_149694_1_, int p_149694_2_, int p_149694_3_, int p_149694_4_) { + 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_) { + return 0; + } + + @Override + public int damageDropped(int p_149692_1_) { + return 0; + } + + @Override + public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { + return new TileGaiaHead(); + } - @Override - public int damageDropped(int p_149692_1_) { - return 0; - } - - @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/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index 02c847a84..dc0d407fa 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -85,7 +85,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { AxisAlignedBB aabb = AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1); List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, aabb); entities.addAll(world.getEntitiesWithinAABB(EntityItem.class, aabb)); - + if(!entities.isEmpty()) { for(Entity entity : entities) { TileLightRelay relay = relays.get(world.rand.nextInt(relays.size())); diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index 3ea16cdda..f8a69fe9f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -152,12 +152,12 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable super.breakBlock(par1World, par2, par3, par4, par5, par6); } - + @Override public boolean hasComparatorInputOverride() { return true; } - + @Override public int getComparatorInputOverride(World world, int x, int y, int z, int s) { TileSparkChanger changer = (TileSparkChanger) world.getTileEntity(x, y, z); @@ -166,7 +166,7 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable return 0; return stack.getItemDamage() + 1; } - + @Override public TileEntity createNewTileEntity(World world, int meta) { return new TileSparkChanger(); diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index e4666d5f9..b51841fb0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -36,7 +36,7 @@ public class BlockTeruTeruBozu extends BlockModContainer implements ILexiconable 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) { if(!world.isRemote && e instanceof EntityItem) { @@ -49,7 +49,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) { ItemStack stack = player.getCurrentEquippedItem(); @@ -60,11 +60,11 @@ public class BlockTeruTeruBozu extends BlockModContainer implements ILexiconable } return false; } - + public boolean isSunflower(ItemStack stack) { return stack.getItem() == Item.getItemFromBlock(Blocks.double_plant) && stack.getItemDamage() == 0; } - + public boolean removeRain(World world) { if(world.isRaining()) { world.getWorldInfo().setRaining(false); @@ -72,37 +72,37 @@ public class BlockTeruTeruBozu extends BlockModContainer implements ILexiconable } return false; } - + @Override public boolean hasComparatorInputOverride() { return true; } - + @Override public int getComparatorInputOverride(World world, int x, int y, int z, int s) { 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() { return false; } - + @Override public int getRenderType() { return LibRenderIDs.idTeruTeruBozu; diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index aa0048022..836f97be0 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -348,7 +348,7 @@ public final class ModBlocks { gaiaHead = new BlockGaiaHead(); corporeaRetainer = new BlockCorporeaRetainer(); teruTeruBozu = new BlockTeruTeruBozu(); - + ModFluffBlocks.init(); for(int i = 0; i < 16; i++) @@ -493,7 +493,7 @@ public final class ModBlocks { registerSubTileWithMini(LibBlockNames.SUBTILE_BUBBELL, SubTileBubbell.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_SOLEGNOLIA, SubTileSolegnolia.class); } - + public static void registerMultiparts() { if(Loader.isModLoaded("ForgeMultipart")) { try { @@ -510,12 +510,12 @@ public final class ModBlocks { if(innerClazz.getSimpleName().equals("Mini")) 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/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index e25f1cd90..2257c5df0 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -179,14 +179,14 @@ public final class ModFluffBlocks { public static Block[] pavementStairs = new Block[BlockPavement.TYPES]; public static Block[] pavementSlabs = new Block[BlockPavement.TYPES]; public static 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 managlassPane; public static Block alfglassPane; public static Block bifrostPane; @@ -250,7 +250,7 @@ public final class ModFluffBlocks { biomeStoneB = new BlockBiomeStoneB(); stone = new Block18Stone(); pavement = new BlockPavement(); - + if(ConfigHandler.darkQuartzEnabled) { darkQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_DARK); darkQuartzSlab = new BlockSpecialQuartzSlab(darkQuartz, false); @@ -308,7 +308,7 @@ public final class ModFluffBlocks { pavementSlabs[i] = new BlockPavementSlab(false, i, i); pavementFullSlabs[i] = new BlockPavementSlab(true, i, i); } - + endStoneSlab = new BlockEndStoneSlab(false); endStoneSlabFull = new BlockEndStoneSlab(true); endStoneStairs = new BlockEndStoneStairs(); @@ -319,7 +319,7 @@ public final class ModFluffBlocks { managlassPane = new BlockManaglassPane(); alfglassPane = new BlockAlfglassPane(); bifrostPane = new BlockBifrostPane(); - + if(ConfigHandler.darkQuartzEnabled) { ((BlockModSlab) darkQuartzSlab).register(); ((BlockModSlab) darkQuartzSlabFull).register(); @@ -388,7 +388,7 @@ public final class ModFluffBlocks { ((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/corporea/BlockCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java index 725ef2825..c41f79dbd 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -89,12 +89,12 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { return LexiconData.corporeaCrystalCube; } - + @Override public boolean hasComparatorInputOverride() { return true; } - + @Override public int getComparatorInputOverride(World world, int x, int y, int z, int s) { return ((TileCorporeaCrystalCube) world.getTileEntity(x, y, z)).compValue; 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 a9232c089..2d804b714 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 @@ public class BlockCorporeaRetainer extends BlockModContainer implements ILexicon setStepSound(soundTypeMetal); setBlockName(LibBlockNames.CORPOREA_RETAINER); } - + @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); @@ -53,17 +53,17 @@ public class BlockCorporeaRetainer extends BlockModContainer implements ILexicon public boolean hasComparatorInputOverride() { return true; } - + @Override public int getComparatorInputOverride(World world, int x, int y, int z, int s) { return ((TileCorporeaRetainer) world.getTileEntity(x, y, z)).hasPendingRequest() ? 15 : 0; } - + @Override public TileEntity createNewTileEntity(World world, int meta) { return new TileCorporeaRetainer(); } - + @Override public Achievement getAchievementOnCraft(ItemStack stack, EntityPlayer player, IInventory matrix) { return ModAchievements.corporeaCraft; 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 9c3511687..d13de732d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -15,25 +15,16 @@ 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.client.renderer.texture.TextureAtlasSprite; 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.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.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 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; 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 5467f90a0..081d8e7da 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,7 +11,6 @@ package vazkii.botania.common.block.decor.panes; import vazkii.botania.common.block.ModBlocks; -import net.minecraft.block.Block; public class BlockAlfglassPane extends BlockModPane { 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 524fd53e1..495e39016 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,16 +10,15 @@ */ package vazkii.botania.common.block.decor.panes; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import vazkii.botania.client.render.block.InterpolatedIcon; -import vazkii.botania.common.block.ModBlocks; -import net.minecraft.block.Block; 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 cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockBifrostPane extends BlockModPane { @@ -27,7 +26,7 @@ public class BlockBifrostPane extends BlockModPane { super(ModBlocks.bifrostPerm); MinecraftForge.EVENT_BUS.register(this); } - + @SubscribeEvent @SideOnly(Side.CLIENT) public void loadTextures(TextureStitchEvent.Pre event) { @@ -37,7 +36,7 @@ public class BlockBifrostPane extends BlockModPane { iconTop = icon; } } - + @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister reg) { 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 8295835d7..d509b38b9 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,7 +11,6 @@ package vazkii.botania.common.block.decor.panes; import vazkii.botania.common.block.ModBlocks; -import net.minecraft.block.Block; public class BlockManaglassPane 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 63755e1a0..3d03e3c79 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 @@ -10,31 +10,26 @@ */ package vazkii.botania.common.block.decor.panes; -import vazkii.botania.api.lexicon.LexiconEntry; -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 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.minecraft.block.Block; import net.minecraft.block.BlockPane; 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.IIcon; import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; 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; +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; public class BlockModPane extends BlockPane { Block source; public IIcon iconTop; - + public BlockModPane(Block source) { super("", "", Material.glass, false); this.source = source; @@ -49,41 +44,44 @@ public class BlockModPane extends BlockPane { GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); return super.setBlockName(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) { return false; } - + @Override public int getRenderType() { return 18; } - + @Override public int getRenderBlockPass() { return 1; } - - @SideOnly(Side.CLIENT) - public IIcon func_150097_e() { - return source.getIcon(0, 0); - } - - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) { - return side >= 2 ? iconTop : source.getIcon(side, meta); - } - 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); - } + @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); + } } 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 439bb2813..2b96339e4 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -50,7 +50,7 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, boolean lastFragile = false; public static IIcon manaIcon; - + public BlockPool() { super(Material.rock); setHardness(2.0F); 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 b85fb46a6..6a157af6d 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -23,7 +23,6 @@ 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.block.tile.mana.TilePool; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -78,7 +77,7 @@ public class BlockTerraPlate extends BlockModContainer implements ILexiconable { public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { return LexiconData.terrasteel; } - + @Override public boolean hasComparatorInputOverride() { 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 f3299d0da..b1945f159 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.string; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockPistonBase; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -26,6 +24,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; 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 6abbe3468..6512281e1 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -44,17 +44,17 @@ public class BlockRedStringInterceptor extends BlockRedString { public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int 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) { world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z) & -9, 1 | 2); } - + @Override public int tickRate(World p_149738_1_) { return 2; } - + @Override public TileRedString createNewTileEntity(World world, int meta) { return new TileRedStringInterceptor(); 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 b9058c7dd..4eb580e27 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTileDecor.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTileDecor.java @@ -18,9 +18,9 @@ public class SubTileDecor extends SubTileEntity { 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/functional/SubTileBubbell.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java index 7d90ea700..10c62757c 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,7 +12,6 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; 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 5f05ac514..91ca70e39 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 @@ -34,7 +34,7 @@ public class SubTileExoflame extends SubTileFunctional { boolean did = false; int cost = 300; - + fireFurnaces : { for(int i = -RANGE; i < RANGE + 1; i++) for(int j = -RANGE_Y; j < RANGE_Y + 1; j++) @@ -70,7 +70,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) heatable.boostCookTime(); 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 5e6e5dbf6..d05fefa14 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 @@ -32,9 +32,7 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.subtile.ISpecialFlower; import vazkii.botania.api.subtile.ISubTileContainer; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileEntity; @@ -111,7 +109,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { blockToPlace = ReflectionHelper.getPrivateValue(ItemReed.class, (ItemReed) stackItem, LibObfuscation.REED_ITEM); else if(stackItem instanceof ItemRedstone) 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)) { @@ -119,7 +117,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { if(ConfigHandler.blockBreakParticles) supertile.getWorldObj().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); if(tile != null && tile instanceof ISubTileContainer) { ISubTileContainer container = (ISubTileContainer) tile; 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 051fdcf42..0b0dd51f3 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 @@ -22,7 +22,6 @@ import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileCell; import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibLexicon; public class SubTileDandelifeon extends SubTileGenerating { @@ -58,7 +57,7 @@ public class SubTileDandelifeon extends SubTileGenerating { for(int j = 0; j < table[0].length; j++) { int gen = table[i][j]; int adj = getAdjCells(table, i, j); - + int newVal = gen; if(adj < 2 || adj > 3) newVal = -1; @@ -68,15 +67,15 @@ public class SubTileDandelifeon extends SubTileGenerating { else if(gen > -1) newVal = gen + 1; } - + int xdist = Math.abs(i - RANGE); int zdist = Math.abs(j - RANGE); - int allowDist = (newVal == 1 && gen == 0) ? 3 : 1; + int allowDist = newVal == 1 && gen == 0 ? 3 : 1; if(xdist <= allowDist && zdist <= allowDist && newVal > -1) { gen = newVal; newVal = gen == 1 ? -1 : -2; } - + if(newVal != gen) changes.add(new int[] { i, j, newVal, gen }); } @@ -90,7 +89,7 @@ public class SubTileDandelifeon extends SubTileGenerating { int pz = z - RANGE + change[1]; int val = change[2]; int old = change[3]; - + setBlockForGeneration(px, y, pz, val, old); } } @@ -107,7 +106,7 @@ public class SubTileDandelifeon extends SubTileGenerating { for(int j = 0; j < diam; j++) { int px = x - RANGE + i; int pz = z - RANGE + j; - table[i][j] = getCellGeneration(px, y, pz); + table[i][j] = getCellGeneration(px, y, pz); } return table; @@ -132,7 +131,7 @@ public class SubTileDandelifeon extends SubTileGenerating { count++; } } - + return count; } @@ -147,7 +146,7 @@ public class SubTileDandelifeon extends SubTileGenerating { max = gen; } } - + return max == -1 ? -1 : max + 1; } @@ -191,7 +190,7 @@ public class SubTileDandelifeon extends SubTileGenerating { public int getColor() { return 0x9c0a7e; } - + @Override public LexiconEntry getEntry() { return LexiconData.dandelifeon; 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 a91d29fa8..c5a461744 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 @@ -18,7 +18,6 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; 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 index f2a4f2804..be4092079 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTilePassiveGenerating.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTilePassiveGenerating.java @@ -10,15 +10,7 @@ */ package vazkii.botania.common.block.subtile.generating; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; import vazkii.botania.api.subtile.SubTileGenerating; -import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.core.helper.ItemNBTHelper; public class SubTilePassiveGenerating extends SubTileGenerating { 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 02ce55e1e..c8eff10fb 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 @@ -10,9 +10,7 @@ */ package vazkii.botania.common.block.subtile.generating; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.Botania; import vazkii.botania.common.lexicon.LexiconData; @@ -48,7 +46,7 @@ public class SubTileThermalily extends SubTileHydroangeas { public Material getMaterialToSearchFor() { return Material.lava; } - + @Override public void playSound() { supertile.getWorldObj().playSoundEffect(supertile.xCoord, supertile.yCoord, supertile.zCoord, "botania:thermalily", 0.2F, 1F); 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 ef7d844e0..6c7429f23 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCell.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCell.java @@ -15,7 +15,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChunkCoordinates; public class TileCell extends TileMod { - + private static final String TAG_GENERATION = "generation"; private static final String TAG_TICKED = "ticked"; private static final String TAG_FLOWER_X = "flowerX"; @@ -24,17 +24,17 @@ public class TileCell extends TileMod { private static final String TAG_VALID_X = "validX"; private static final String TAG_VALID_Y = "validY"; private static final String TAG_VALID_Z = "validZ"; - + private int generation; private boolean ticked; private ChunkCoordinates flowerCoords = new ChunkCoordinates(); private ChunkCoordinates validCoords = new ChunkCoordinates(); - + @Override public boolean canUpdate() { return false; } - + public void setGeneration(TileEntity flower, int gen) { generation = gen; if(!ticked) { @@ -48,15 +48,15 @@ public class TileCell extends TileMod { } else if(!matchCoords(validCoords, this) || !matchCoords(flowerCoords, flower)) worldObj.setBlockToAir(xCoord, yCoord, zCoord); } - + private boolean matchCoords(ChunkCoordinates coords, TileEntity tile) { return coords.posX == tile.xCoord && coords.posY == tile.yCoord && coords.posZ == tile.zCoord; } - + public int getGeneration() { return generation; } - + @Override public void writeCustomNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_GENERATION, generation); @@ -70,7 +70,7 @@ public class TileCell extends TileMod { cmp.setInteger(TAG_VALID_Z, validCoords.posZ); } } - + @Override public void readCustomNBT(NBTTagCompound cmp) { generation = cmp.getInteger(TAG_GENERATION); @@ -84,5 +84,5 @@ public class TileCell extends TileMod { validCoords.posZ = cmp.getInteger(TAG_VALID_Z); } } - + } 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 1195c5e42..9fe732f6e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -14,7 +14,6 @@ import java.awt.Color; import net.minecraft.block.Block; 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.item.ItemStack; @@ -165,11 +164,11 @@ public class TileLightRelay extends TileMod implements IWandBindable { setDead(); return; } - + boolean isItem = riddenByEntity instanceof EntityItem; if(!isItem && ticksExisted % 30 == 0) worldObj.playSoundAtEntity(this, "botania:lightRelay", 0.2F, (float) Math.random() * 0.3F + 0.7F); - + int exitX = getExitX(); int exitY = getExitY(); int exitZ = getExitZ(); 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 8363ca33e..3f3fa1b56 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -89,12 +89,12 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil } } - boolean special = isOnSpecialSoil(); + boolean special = isOnSpecialSoil(); if(special) { subTile.overgrowth = true; if(subTile.isOvergrowthAffected()) { subTile.onUpdate(); - subTile.overgrowthBoost = true; + subTile.overgrowthBoost = true; } } subTile.onUpdate(); 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 f14499d5f..21e8fd2d0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java @@ -13,7 +13,7 @@ package vazkii.botania.common.block.tile; public class TileTeruTeruBozu extends TileMod { public boolean wasRaining = false; - + @Override public void updateEntity() { boolean isRaining = worldObj.isRaining(); @@ -24,5 +24,5 @@ public class TileTeruTeruBozu extends TileMod { worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); wasRaining = isRaining; } - + } 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 341f47418..0c8b71c2e 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 @@ -16,7 +16,6 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import vazkii.botania.api.corporea.CorporeaHelper; -import vazkii.botania.api.corporea.ICorporeaInterceptor; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -26,7 +25,7 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor private static final String TAG_REQUEST_TARGET = "requestTarget"; private static final String TAG_ITEM_COUNT = "itemCount"; - + private static final double LOG_2 = Math.log(2); ItemStack requestTarget; @@ -71,7 +70,7 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor doCorporeaRequest(requestTarget, count, spark); } } - + private void updateCount() { if(worldObj.isRemote) return; @@ -84,13 +83,13 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor for(ItemStack stack : stacks) itemCount += stack.stackSize; } - + if(itemCount != oldCount) { VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); onUpdateCount(); } } - + private void onUpdateCount() { compValue = getComparatorValue(); worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); @@ -118,7 +117,7 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor public int getSizeInventory() { return 1; } - + public int getComparatorValue() { if(itemCount == 0) return 0; @@ -139,8 +138,8 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor public void doCorporeaRequest(Object request, int count, ICorporeaSpark spark) { if(!(request instanceof ItemStack)) return; - - List stacks = CorporeaHelper.requestItem((ItemStack) request, count, spark, true, true); + + List stacks = CorporeaHelper.requestItem(request, count, spark, true, true); spark.onItemsRequested(stacks); boolean did = false; for(ItemStack reqStack : stacks) @@ -150,7 +149,7 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor itemCount -= reqStack.stackSize; did = true; } - + if(did) { VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); onUpdateCount(); 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 329d8a763..c6554fa21 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 @@ -20,7 +20,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.corporea.CorporeaHelper; -import vazkii.botania.api.corporea.ICorporeaInterceptor; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.common.core.helper.InventoryHelper; @@ -89,12 +88,12 @@ public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaReq public void doCorporeaRequest(Object request, int count, ICorporeaSpark spark) { if(!(request instanceof ItemStack)) return; - + IInventory inv = InventoryHelper.getInventory(worldObj, xCoord, yCoord - 1, zCoord); if(inv == null) inv = InventoryHelper.getInventory(worldObj, xCoord, yCoord - 2, zCoord); - List stacks = CorporeaHelper.requestItem((ItemStack) request, count, spark, true, true); + List stacks = CorporeaHelper.requestItem(request, count, spark, true, true); spark.onItemsRequested(stacks); for(ItemStack reqStack : stacks) if(request != null) { 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 a71cd09ee..ee12f349c 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.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.ChatStyle; @@ -35,7 +34,6 @@ import org.apache.commons.lang3.text.WordUtils; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaAutoCompleteController; -import vazkii.botania.api.corporea.ICorporeaInterceptor; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.common.achievement.ModAchievements; @@ -202,12 +200,12 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ public String getInventoryName() { return LibBlockNames.CORPOREA_INDEX; } - + @Override public void doCorporeaRequest(Object request, int count, ICorporeaSpark spark) { if(!(request instanceof String)) return; - + List stacks = CorporeaHelper.requestItem((String) request, count, spark, true); spark.onItemsRequested(stacks); for(ItemStack stack : stacks) 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 0b39e50fd..adf680936 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 @@ -59,14 +59,14 @@ 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); - + TileEntity requestor = (TileEntity) source.getInventory(); for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { TileEntity tile = worldObj.getTileEntity(xCoord + dir.offsetX, yCoord, zCoord + dir.offsetZ); if(tile != null && tile instanceof TileCorporeaRetainer) ((TileCorporeaRetainer) tile).setPendingRequest(requestor.xCoord, requestor.yCoord, requestor.zCoord, request, count); } - + return; } } 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 ad9164c1e..841981fad 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,7 +17,6 @@ import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.common.block.tile.TileMod; -import vazkii.botania.common.lib.LibBlockNames; public class TileCorporeaRetainer extends TileMod { @@ -33,16 +32,16 @@ public class TileCorporeaRetainer extends TileMod { private static final int REQUEST_NULL = 0; private static final int REQUEST_ITEMSTACK = 1; private static final int REQUEST_STRING = 2; - + boolean pendingRequest = false; int requestX, requestY, requestZ; Object request; int requestCount; - + public void setPendingRequest(int x, int y, int z, Object request, int requestCount) { if(pendingRequest) return; - + requestX = x; requestY = y; requestZ = z; @@ -51,15 +50,15 @@ public class TileCorporeaRetainer extends TileMod { pendingRequest = true; worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); } - + public boolean hasPendingRequest() { return pendingRequest; } - + public void fulfilRequest() { if(!hasPendingRequest()) return; - + ICorporeaSpark spark = CorporeaHelper.getSparkForBlock(worldObj, requestX, requestY, requestZ); if(spark != null) { IInventory inv = spark.getInventory(); @@ -71,11 +70,11 @@ public class TileCorporeaRetainer extends TileMod { } } } - + @Override public void writeCustomNBT(NBTTagCompound cmp) { super.writeCustomNBT(cmp); - + cmp.setBoolean(TAG_PENDING_REQUEST, pendingRequest); cmp.setInteger(TAG_REQUEST_X, requestX); cmp.setInteger(TAG_REQUEST_Y, requestY); @@ -85,7 +84,7 @@ public class TileCorporeaRetainer extends TileMod { if(request != null) reqType = request instanceof String ? REQUEST_STRING : REQUEST_ITEMSTACK; cmp.setInteger(TAG_REQUEST_TYPE, reqType); - + switch (reqType) { case REQUEST_STRING: cmp.setString(TAG_REQUEST_CONTENTS, (String) request); @@ -99,16 +98,16 @@ public class TileCorporeaRetainer extends TileMod { } cmp.setInteger(TAG_REQUEST_COUNT, requestCount); } - + @Override public void readCustomNBT(NBTTagCompound cmp) { 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 reqType = cmp.getInteger(TAG_REQUEST_TYPE); switch (reqType) { case REQUEST_STRING: @@ -122,5 +121,5 @@ public class TileCorporeaRetainer extends TileMod { } requestCount = cmp.getInteger(TAG_REQUEST_COUNT); } - + } 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 276383b17..d05269770 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 @@ -104,7 +104,7 @@ 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((IInventory) inv) : new int[0]; + return inv instanceof ISidedInventory ? ((ISidedInventory) inv).getAccessibleSlotsFromSide(side) : inv instanceof IInventory ? InventoryHelper.buildSlotsForLinearInventory(inv) : new int[0]; } @Override @@ -131,7 +131,7 @@ public class TileRedStringContainer extends TileRedString implements ISidedInven TileEntity tile = getTileAtBinding(); if(tile == null || !(tile instanceof IInventory)) return null; - + return InventoryHelper.getInventory((IInventory) tile); } 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 a643eb2a2..07fb784c6 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 @@ -21,15 +21,15 @@ import net.minecraft.world.World; public class TileRedStringInterceptor extends TileRedString { public static List interceptors = new ArrayList(); - + @Override public void updateEntity() { super.updateEntity(); - + if(!interceptors.contains(this)) interceptors.add(this); } - + @Override public boolean acceptBlock(int x, int y, int z) { return worldObj.getTileEntity(x, y, z) != null; @@ -38,17 +38,17 @@ public class TileRedStringInterceptor extends TileRedString { public boolean removeFromList() { return !tileEntityInvalid && worldObj.getTileEntity(xCoord, yCoord, zCoord) == this; } - + public static void onInteract(EntityPlayer player, World world, int x, int y, int z) { List remove = new ArrayList(); boolean did = false; - + for(TileRedStringInterceptor inter : interceptors) { if(!inter.removeFromList()) { remove.add(inter); continue; } - + if(inter.worldObj == world) { ChunkCoordinates coords = inter.getBinding(); if(coords != null && coords.posX == x && coords.posY == y && coords.posZ == z) { @@ -58,12 +58,12 @@ public class TileRedStringInterceptor extends TileRedString { world.setBlockMetadataWithNotify(inter.xCoord, inter.yCoord, inter.zCoord, meta | 8, 1 | 2); world.scheduleBlockUpdate(inter.xCoord, inter.yCoord, inter.zCoord, block, block.tickRate(world)); } - + did = true; } } } - + interceptors.removeAll(remove); if(did) { if(world.isRemote) diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 37b34ccb1..4fc0aaa28 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -157,7 +157,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModFluffBlocks.managlassPane); addBlock(ModBlocks.elfGlass); addBlock(ModFluffBlocks.alfglassPane); - + addItem(ModItems.glassPick); addItem(ModItems.manasteelPick); addItem(ModItems.manasteelShovel); @@ -326,7 +326,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModFluffBlocks.snowBrickSlab); addBlock(ModFluffBlocks.tileStairs); addBlock(ModFluffBlocks.tileSlab); - + addBlock(ModFluffBlocks.livingwoodStairs); addBlock(ModFluffBlocks.livingwoodSlab); addBlock(ModFluffBlocks.livingwoodWall); @@ -377,7 +377,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModFluffBlocks.stoneSlabs[i]); addBlock(ModFluffBlocks.stoneWall); } - + addBlock(ModFluffBlocks.biomeStoneA); addBlock(ModFluffBlocks.biomeStoneB); for(int i = 0; i < 24; i++) @@ -385,12 +385,12 @@ public final class BotaniaCreativeTab extends CreativeTabs { for(int i = 0; i < 24; i++) addBlock(ModFluffBlocks.biomeStoneSlabs[i]); addBlock(ModFluffBlocks.biomeStoneWall); - + addBlock(ModFluffBlocks.pavement); - for(int i = 0; i < ModFluffBlocks.pavementStairs.length; i++) - addBlock(ModFluffBlocks.pavementStairs[i]); - for(int i = 0; i < ModFluffBlocks.pavementSlabs.length; i++) - addBlock(ModFluffBlocks.pavementSlabs[i]); + for (Block pavementStair : ModFluffBlocks.pavementStairs) + addBlock(pavementStair); + for (Block pavementSlab : ModFluffBlocks.pavementSlabs) + addBlock(pavementSlab); if(ConfigHandler.enderStuff19Enabled) { addBlock(ModBlocks.endStoneBrick); 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 5a84fe437..08878ac78 100644 --- a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java @@ -33,7 +33,7 @@ public class BiomeDecorationHandler { 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) { 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 085e1b8b8..98dc91b1d 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -29,7 +29,7 @@ public final class ConfigHandler { private static final String CATEGORY_POTIONS = "potions"; public static final int hardcorePassiveGeneration = 72000; - + public static boolean useShaders = true; public static boolean lexiconRotatingItems = true; public static boolean lexiconJustifiedText = false; @@ -75,7 +75,7 @@ public final class ConfigHandler { private static boolean verifiedPotionArray = false; private static int potionArrayLimit = 0; - + public static int potionIDSoulCross = 91; public static int potionIDFeatherfeet = 92; public static int potionIDEmptiness = 93; @@ -248,7 +248,7 @@ public final class ConfigHandler { 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) { @@ -258,7 +258,7 @@ public final class ConfigHandler { return val; } - + private static void verifyPotionArray() { if(Loader.isModLoaded("DragonAPI")) potionArrayLimit = Potion.potionTypes.length; 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 bbdcd972e..9a26752ad 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -172,7 +172,7 @@ public class CommonProxy { FMLCommonHandler.instance().exitJava(1, true); } } - + public void serverStarting(FMLServerStartingEvent event) { event.registerServerCommand(new CommandDownloadLatest()); event.registerServerCommand(new CommandShare()); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 1b98301f9..007225f6f 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -14,8 +14,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.logging.log4j.Level; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -26,8 +24,10 @@ import net.minecraft.item.crafting.IRecipe; 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.client.lib.LibRenderIDs; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; @@ -298,7 +298,7 @@ public final class ModCraftingRecipes { public static IRecipe recipeCellBlock; public static IRecipe recipeCorporeaRetainer; public static IRecipe recipeTeruTeruBozu; - + // Garden of Glass public static IRecipe recipeRootToSapling; public static IRecipe recipeRootToFertilizer; @@ -309,7 +309,7 @@ public final class ModCraftingRecipes { public static void init() { int recipeListSize = CraftingManager.getInstance().getRecipeList().size(); - + // Lexicon Recipe addShapelessOreDictRecipe(new ItemStack(ModItems.lexicon), "treeSapling", Items.book); recipeLexicon = BotaniaAPI.getLatestAddedRecipe(); @@ -1447,7 +1447,7 @@ public final class ModCraftingRecipes { 'S', LibOreDict.RED_STRING, 'M', new ItemStack(ModBlocks.spreader)); recipeRedStringRelay = BotaniaAPI.getLatestAddedRecipe(); - + // Red String Interceptor Recipe addOreDictRecipe(new ItemStack(ModBlocks.redStringInterceptor), "RRR", "RMS", "RRR", @@ -1991,7 +1991,7 @@ public final class ModCraftingRecipes { // Manufactory Halo Recipe addShapelessOreDictRecipe(new ItemStack(ModItems.autocraftingHalo), new ItemStack(ModItems.craftingHalo), LibOreDict.MANA_DIAMOND); recipeAutocraftingHalo = BotaniaAPI.getLatestAddedRecipe(); - + // 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)); @@ -2000,22 +2000,22 @@ public final class ModCraftingRecipes { 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)); recipeCellBlock = BotaniaAPI.getLatestAddedRecipe(); - + // Corporea Retainer Recipe 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)); recipeTeruTeruBozu = BotaniaAPI.getLatestAddedRecipe(); - + /////////////////////////////////////////////////////////////////////////////////////////////////////////// // Storage Block/Nugget Recipes @@ -2095,7 +2095,7 @@ public final class ModCraftingRecipes { addPane(ModBlocks.manaGlass, ModFluffBlocks.managlassPane); addPane(ModBlocks.elfGlass, ModFluffBlocks.alfglassPane); addPane(ModBlocks.bifrostPerm, ModFluffBlocks.bifrostPane); - + // Biome Stone Recipes for(int i = 0; i < 8; i++) { GameRegistry.addSmelting(new ItemStack(ModFluffBlocks.biomeStoneA, 1, i + 8), new ItemStack(ModFluffBlocks.biomeStoneA, 1, i), 0.1F); @@ -2115,14 +2115,14 @@ public final class ModCraftingRecipes { // 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) initGardenOfGlass(); - + int newRecipeListSize = CraftingManager.getInstance().getRecipeList().size(); FMLLog.log(Level.INFO, "[Botania] Registered %d recipes.", newRecipeListSize - recipeListSize); } @@ -2182,7 +2182,7 @@ public final class ModCraftingRecipes { "BBB", "BBB", 'B', new ItemStack(block, 1, blockMeta)); } - + private static void addPane(Block block, Block pane) { GameRegistry.addRecipe(new ItemStack(pane, 16), "BBB", "BBB", diff --git a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java index 0009918a2..9dd2a935a 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java @@ -92,7 +92,7 @@ public final class ModPetalRecipes { narslimmusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_NARSLIMMUS), lime, limeMana, green, greenMana, black, runeSummer, runeWater); spectrolusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SPECTROLUS), redMana, orangeMana, yellowMana, greenMana, blueMana, cyanMana, purpleMana, white, runeWinter, runeAir, pixieDust); dandelifeonRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DANDELIFEON), purpleMana, purpleMana, limeMana, greenMana, runeWater, runeFire, runeEarth, runeAir, gaiaSpirit); - + jadedAmaranthusRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_JADED_AMARANTHUS), purpleMana, purpleMana, lime, purple, green, runeSpring, redstoneRoot); bellethorneRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BELLETHORN), redMana, redMana, cyan, cyan, red, redstoneRoot); dreadthorneRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DREADTHORN), blackMana, purpleMana, cyan, cyan, black, purple, redstoneRoot); diff --git a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java index ebd3489a7..8d050076e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java @@ -56,7 +56,7 @@ public class EntityPinkWither extends EntityWither { if(!player.isSneaking()) { player.mountEntity(this); return true; - } + } return false; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java index 6b0938b3b..5fea97229 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java @@ -20,7 +20,6 @@ import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.DamageSource; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -110,12 +109,12 @@ public class EntityThornChakram extends EntityThrowable { protected void onImpact(MovingObjectPosition pos) { if(noClip) return; - + Block block = worldObj.getBlock(pos.blockX, pos.blockY, pos.blockZ); - TileEntity tile = worldObj.getTileEntity(pos.blockX, pos.blockY, pos.blockZ); + worldObj.getTileEntity(pos.blockX, pos.blockY, pos.blockZ); if(block instanceof BlockBush || block instanceof BlockLeaves) return; - + boolean fire = isFire(); EntityLivingBase thrower = getThrower(); if(pos.entityHit != null && pos.entityHit instanceof EntityLivingBase && pos.entityHit != thrower) { 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 2f94548ad..d99dd0c93 100644 --- a/src/main/java/vazkii/botania/common/integration/multipart/MultipartHandler.java +++ b/src/main/java/vazkii/botania/common/integration/multipart/MultipartHandler.java @@ -58,19 +58,14 @@ public class MultipartHandler { List stacks = new ArrayList(); Item item = Item.getItemFromBlock(block); block.getSubBlocks(item, block.getCreativeTabToDisplayOn(), stacks); - - for(ItemStack stack : stacks) + + for(ItemStack stack : stacks) if(stack.getItem() == item) registerMultipart(block, stack.getItemDamage()); } - - private static void registerMultipartMetadataLine(Block block, int maxMeta) { - for(int i = 0; i < maxMeta; i++) - registerMultipart(block, i); - } private static void registerMultipart(Block block, int meta) { MicroMaterialRegistry.registerMaterial(new BlockMicroMaterial(block, meta), block.getUnlocalizedName() + (meta == 0 ? "" : "_" + meta)); } - + } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/item/ItemAutocraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemAutocraftingHalo.java index afde69c26..abafbe8c7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAutocraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemAutocraftingHalo.java @@ -22,27 +22,27 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemAutocraftingHalo extends ItemCraftingHalo { private static final ResourceLocation glowTexture = new ResourceLocation(LibResources.MISC_GLOW_CYAN); - + public ItemAutocraftingHalo() { super(LibItemNames.AUTOCRAFTING_HALO); } - + @Override public void onUpdate(ItemStack stack, World world, Entity entity, int pos, boolean equipped) { super.onUpdate(stack, world, entity, pos, equipped); - + if(entity instanceof EntityPlayer && !equipped) { EntityPlayer player = (EntityPlayer) entity; IInventory inv = getFakeInv(player); for(int i = 1; i < SEGMENTS; i++) tryCraft(player, stack, i, false, inv, false); - } + } } - + @Override public ResourceLocation getGlowResource() { return glowTexture; } - + } diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index aa3b6a9bc..98cd2cd1c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -191,8 +191,8 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { Block block = getBlock(par1ItemStack); 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 ? "" : " (" + EnumChatFormatting.GREEN + stack.getDisplayName() + EnumChatFormatting.RESET + ")"); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index b831a8bb3..a2bec1876 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -77,7 +77,7 @@ public class ItemBottledMana extends ItemMod { player.addPotionEffect(new PotionEffect(Potion.resistance.id, 300, 5)); player.motionY = 6; } - + break; } case 5 : { // Randomly set HP diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index e948ec813..dd13df4db 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -84,7 +84,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { MinecraftForge.EVENT_BUS.register(this); FMLCommonHandler.instance().bus().register(this); } - + public ItemCraftingHalo(String name) { setUnlocalizedName(name); setMaxStackSize(1); @@ -105,7 +105,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { return stack; } - + public static IInventory getFakeInv(EntityPlayer player) { GenericInventory tempInv = new GenericInventory("temp", false, player.inventory.getSizeInventory() - 4); tempInv.copyFrom(player.inventory); @@ -130,7 +130,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { ItemStack itemForPos = getItemForSlot(stack, slot); if(itemForPos == null) return; - + ItemStack[] recipe = getCraftingItems(stack, slot); if(validate) recipe = validateRecipe(player, stack, recipe, slot); @@ -164,7 +164,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { if(recipe[9].stackSize != InventoryHelper.testInventoryInsertion(inv, recipe[9], ForgeDirection.UNKNOWN)) return false; - + return consumeRecipeIngredients(recipe, inv, null); } @@ -173,9 +173,9 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { if(!player.inventory.addItemStackToInventory(recipe[9])) player.dropPlayerItemWithRandomChoice(recipe[9], false); - if(!particles) + if(!particles) return; - + Vec3 lookVec3 = player.getLookVec(); Vector3 centerVector = Vector3.fromEntityCenter(player).add(lookVec3.xCoord * 3, 1.3, lookVec3.zCoord * 3); float m = 0.1F; @@ -517,7 +517,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { public ResourceLocation getGlowResource() { return glowTexture; } - + @SideOnly(Side.CLIENT) public static void renderHUD(ScaledResolution resolution, EntityPlayer player, ItemStack stack) { Minecraft mc = Minecraft.getMinecraft(); diff --git a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java index 26e115cbf..42363e19a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java +++ b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java @@ -10,21 +10,14 @@ */ package vazkii.botania.common.item; -import java.util.UUID; - import net.minecraft.block.BlockSkull; 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.MathHelper; import net.minecraft.world.World; - -import com.mojang.authlib.GameProfile; - import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibItemNames; @@ -90,7 +83,7 @@ public class ItemGaiaHead extends ItemMod { if (p_77648_7_ == 1) { - i1 = MathHelper.floor_double((double)(p_77648_2_.rotationYaw * 16.0F / 360.0F) + 0.5D) & 15; + i1 = MathHelper.floor_double(p_77648_2_.rotationYaw * 16.0F / 360.0F + 0.5D) & 15; } TileEntity tileentity = p_77648_3_.getTileEntity(p_77648_4_, p_77648_5_, p_77648_6_); diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 075597c13..30a8c2ef3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -78,7 +78,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { PotionEffect effect = par3EntityPlayer.getActivePotionEffect(Potion.digSpeed); if(effect != null) effCd -= (effect.getAmplifier() + 1) * 8; - + 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); diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 3e98e0c41..fccaffd3e 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -412,7 +412,7 @@ public final class ModItems { manaweaveBoots = new ItemManaweaveBoots(); autocraftingHalo = new ItemAutocraftingHalo(); gaiaHead = new ItemGaiaHead(); - + OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { OreDictionary.registerOre(LibOreDict.PETAL[i], new ItemStack(petal, 1, 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 c419fb70d..8c565500e 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -193,5 +193,5 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup public Achievement getAchievementOnPickup(ItemStack stack, EntityPlayer player, EntityItem item) { return ModAchievements.brewPickup; } - + } 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 4bd0edce7..8c41703fc 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 { if(canPullItem(item)) { if(pulled > 200) break; - + MathHelper.setEntityMotionFromVector(item, new Vector3(x, y, z), 0.45F); if(player.worldObj.isRemote) { boolean red = player.worldObj.rand.nextBoolean(); 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 0798380d3..f2af5e85e 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 @@ -22,7 +22,6 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.client.event.RenderPlayerEvent; @@ -40,11 +39,6 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosmeticBauble { - private static final String[] NOTES = new String[] { - "F#", "G", "G#", "A", "A#", "B", "C", "C#", "D", "D#", "E", "F", "F#", - "F#", "G", "G#", "A", "A#", "B", "C", "C#", "D", "D#", "E", "F", "F#" - }; - public ItemMonocle() { super(LibItemNames.MONOCLE); } @@ -71,7 +65,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 16F); } } - + @SideOnly(Side.CLIENT) public static void renderHUD(ScaledResolution resolution, EntityPlayer player) { Minecraft mc = Minecraft.getMinecraft(); @@ -80,11 +74,11 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm return; Block block = player.worldObj.getBlock(pos.blockX, pos.blockY, pos.blockZ); int meta = player.worldObj.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ); - TileEntity tile = player.worldObj.getTileEntity(pos.blockX, pos.blockY, pos.blockZ); - + player.worldObj.getTileEntity(pos.blockX, pos.blockY, pos.blockZ); + ItemStack dispStack = null; String text = ""; - + if(block == Blocks.redstone_wire) { dispStack = new ItemStack(Items.redstone); text = EnumChatFormatting.RED + "" + meta; @@ -93,22 +87,22 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm text = "" + (((meta & 12) >> 2) + 1); } else if(block == Blocks.unpowered_comparator || block == Blocks.powered_comparator) { dispStack = new ItemStack(Items.comparator); - text = ((meta & 4) == 4) ? "-" : "+"; + text = (meta & 4) == 4 ? "-" : "+"; } - + if(dispStack == null) return; - + int x = resolution.getScaledWidth() / 2 + 15; int y = resolution.getScaledHeight() / 2 - 8; - + net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); 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); } - + public static boolean hasMonocle(EntityPlayer player) { for(int i = 0; i < 4; i++) { ItemStack stack = PlayerHandler.getPlayerBaubles(player).getStackInSlot(i); @@ -116,7 +110,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm Item item = stack.getItem(); if(item instanceof IBurstViewerBauble) return true; - + if(item instanceof ICosmeticAttachable) { ICosmeticAttachable attach = (ICosmeticAttachable) item; ItemStack cosmetic = attach.getCosmeticItem(stack); @@ -125,7 +119,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm } } } - + return 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 d064e76c1..54ca07f67 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -28,7 +28,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { public static IIcon dasBootIcon; - + public ItemInfiniteFruit() { super(LibItemNames.INFINITE_FRUIT); } @@ -63,7 +63,7 @@ public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { ReflectionHelper.setPrivateValue(EntityPlayer.class, player, 20, LibObfuscation.ITEM_IN_USE_COUNT); } } - + @Override @SideOnly(Side.CLIENT) @@ -76,7 +76,7 @@ public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { public IIcon getIconIndex(ItemStack par1ItemStack) { return isBoot(par1ItemStack) ? dasBootIcon : super.getIconIndex(par1ItemStack); } - + private boolean isBoot(ItemStack par1ItemStack) { String name = par1ItemStack.getDisplayName().toLowerCase().trim(); return name.equals("das boot"); diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index b1cceb038..0352b5e06 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.lexicon.multiblock.Multiblock; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ModAchievements; @@ -534,7 +533,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)); - + daybloom = new BLexiconEntry(LibLexicon.GFLOWER_DAYBLOOM, categoryGenerationFlowers); daybloom.setPriority().setLexiconPages(new PageText("0"), new PageText(ConfigHandler.hardcorePassiveGeneration > 0 ? "1a" : "1"), new PageImage("3", LibResources.ENTRY_DIMINISHING_RETURNS), new PagePetalRecipe("2", ModPetalRecipes.daybloomRecipe), new PageText("4"), new PageText("5")); @@ -573,7 +572,7 @@ public final class LexiconData { dandelifeon = new ALexiconEntry(LibLexicon.GFLOWER_DANDELIFEON, categoryGenerationFlowers); dandelifeon.setLexiconPages(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.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipePylon)); @@ -661,7 +660,7 @@ public final class LexiconData { teruTeruBozu = new BLexiconEntry(LibLexicon.DEVICE_TERU_TERU_BOZU, categoryDevices); teruTeruBozu.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTeruTeruBozu)); - + // TOOLS ENTRIES manaBlaster = new BLexiconEntry(LibLexicon.TOOL_MANA_BLASTER, categoryTools); manaBlaster.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeManaBlaster)); @@ -792,7 +791,7 @@ public final class LexiconData { autocraftingHalo = new BLexiconEntry(LibLexicon.TOOL_AUTOCRAFTING_HALO, categoryTools); autocraftingHalo.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeAutocraftingHalo)); - + // ENDER ENTRIES enderAir = new BLexiconEntry(LibLexicon.ENDER_AIR, categoryEnder); enderAir.setPriority().setLexiconPages(new PageText("0")); @@ -865,7 +864,7 @@ public final class LexiconData { corporeaRetainer = new ALexiconEntry(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.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_BAUBLES), new PageText("2")); @@ -1052,7 +1051,7 @@ public final class LexiconData { pavement = new BLexiconEntry(LibLexicon.MISC_PAVEMENT, categoryMisc); pavement.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipesPavement)); - + if(Botania.bcTriggersLoaded) { bcIntegration = new CLexiconEntry(LibLexicon.MISC_BC_INTEGRATION, categoryMisc, "BuildCraft"); bcIntegration.setLexiconPages(new PageText("0")).setIcon(new ItemStack(Items.redstone)); 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 53506f494..e7a7a612d 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java @@ -13,19 +13,15 @@ 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.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; @@ -35,10 +31,8 @@ import org.lwjgl.opengl.GL12; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; -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 vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.lib.LibResources; import cpw.mods.fml.relauncher.Side; @@ -86,7 +80,7 @@ public class PageMultiblock extends LexiconPage { GL11.glRotatef(-20F, 1, 0, 0); GL11.glRotatef(gui.getElapsedTicks(), 0, 1, 0); - + MultiblockRenderHandler.renderMultiblockOnPage(mb); GL11.glPopMatrix(); diff --git a/src/main/java/vazkii/botania/common/lib/LibAchievementNames.java b/src/main/java/vazkii/botania/common/lib/LibAchievementNames.java index 33bb4b818..5372b364d 100644 --- a/src/main/java/vazkii/botania/common/lib/LibAchievementNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibAchievementNames.java @@ -46,7 +46,7 @@ public final class LibAchievementNames { public static final String LUMINIZER_RIDE = "luminizerRide"; public static final String MANA_BOMB_IGNITE = "manaBombIgnite"; public static final String DANDELIFEON_PICKUP = "dandelifeonPickup"; - + public static final String SIGNAL_FLARE_STUN = "signalFlareStun"; public static final String L20_SHARD_USE = "l20ShardUse"; public static final String GAIA_GUARDIAN_NO_ARMOR = "gaiaGuardianNoArmor"; diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index 63a4abb0b..72beed003 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -252,7 +252,7 @@ public final class LibLexicon { public static final String MISC_CHALLENGES = "challenges"; public static final String MISC_CACOPHONIUM = "cacophonium"; public static final String MISC_PAVEMENT = "pavement"; - + public static final String MISC_TC_INTEGRATION = "tcIntegration"; public static final String MISC_BC_INTEGRATION = "bcIntegration"; public static final String MISC_BANNERS = "banners";