upstream/Botania
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Botania.git synced 2026-11-13 00:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean clean...

Browse Source
This commit is contained in:
Lizbeth Rika committed 2014-08-08 16:02:54 +01:00
1 parent 2d13cde9c5
commit 63bf92274a
35 files changed
+93 -111
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

MODSRC/vazkii/botania/api/BotaniaAPI.java
+1 -1
View File
@@ -259,7 +259,7 @@ public final class BotaniaAPI {
public static List<LexiconEntry> getAllEntries() {
return allEntries;
}
/**
* Registers a Lexicon Entry and adds it to the category passed in.
*/
MODSRC/vazkii/botania/api/item/IExtendedPlayerController.java
+1 -1
View File
@@ -21,7 +21,7 @@ public interface IExtendedPlayerController {
* Sets the extra reach the player should have.
*/
public void setReachDistanceExtension(float f);
/**
* Gets the current reach extension.
*/
MODSRC/vazkii/botania/client/core/handler/BotaniaPlayerController.java
+2 -2
View File
@@ -11,10 +11,10 @@
*/
package vazkii.botania.client.core.handler;
import vazkii.botania.api.item.IExtendedPlayerController;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.PlayerControllerMP;
import net.minecraft.client.network.NetHandlerPlayClient;
import vazkii.botania.api.item.IExtendedPlayerController;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -41,5 +41,5 @@ public class BotaniaPlayerController extends PlayerControllerMP implements IExte
public float getReachDistanceExtension() {
return distance;
}
}
MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java
+7 -7
View File
@@ -92,7 +92,7 @@ import cpw.mods.fml.relauncher.ReflectionHelper;
public class ClientProxy extends CommonProxy {
public static boolean hasRingReachIncrease = false;
@Override
public void init(FMLInitializationEvent event) {
super.init(event);
@@ -165,7 +165,7 @@ public class ClientProxy extends CommonProxy {
public boolean isTheClientPlayer(EntityLivingBase entity) {
return entity == Minecraft.getMinecraft().thePlayer;
}
@Override
public void setExtraReach(EntityLivingBase entity, float reach) {
super.setExtraReach(entity, reach);
@@ -202,7 +202,7 @@ public class ClientProxy extends CommonProxy {
public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m, boolean fake) {
if(!doParticle() && !fake)
return;
FXSparkle sparkle = new FXSparkle(world, x, y, z, size, r, g, b, m);
sparkle.fake = sparkle.noClip = fake;
if(noclipEnabled)
@@ -221,7 +221,7 @@ public class ClientProxy extends CommonProxy {
public void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz, float maxAgeMul) {
if(!doParticle())
return;
FXWisp wisp = new FXWisp(world, x, y, z, size, r, g, b, distanceLimit, maxAgeMul);
wisp.motionX = motionx;
wisp.motionY = motiony;
@@ -229,17 +229,17 @@ public class ClientProxy extends CommonProxy {
Minecraft.getMinecraft().effectRenderer.addEffect(wisp);
}
private boolean doParticle() {
if(!ConfigHandler.useVanillaParticleLimiter)
return true;
float chance = 1F;
if(Minecraft.getMinecraft().gameSettings.particleSetting == 1)
chance = 0.6F;
else if(Minecraft.getMinecraft().gameSettings.particleSetting == 2)
chance = 0.2F;
return Math.random() < chance;
}
MODSRC/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java
+3 -3
View File
@@ -217,7 +217,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa
void back() {
if(backButton.enabled) {
actionPerformed(backButton);
backButton.func_146113_a(this.mc.getSoundHandler());
backButton.func_146113_a(mc.getSoundHandler());
}
}
@@ -225,14 +225,14 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa
void nextPage() {
if(rightButton.enabled) {
actionPerformed(rightButton);
rightButton.func_146113_a(this.mc.getSoundHandler());
rightButton.func_146113_a(mc.getSoundHandler());
}
}
void prevPage() {
if(leftButton.enabled) {
actionPerformed(leftButton);
leftButton.func_146113_a(this.mc.getSoundHandler());
leftButton.func_146113_a(mc.getSoundHandler());
}
}
}
MODSRC/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java
+4 -5
View File
@@ -29,7 +29,6 @@ import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.client.gui.lexicon.button.GuiButtonBack;
import vazkii.botania.client.gui.lexicon.button.GuiButtonInvisible;
import vazkii.botania.client.gui.lexicon.button.GuiButtonPage;
import vazkii.botania.common.lexicon.LexiconData;
public class GuiLexiconIndex extends GuiLexicon implements IParented {
@@ -186,25 +185,25 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
super.keyTyped(par1, par2);
}
void back() {
if(backButton.enabled) {
actionPerformed(backButton);
backButton.func_146113_a(this.mc.getSoundHandler());
backButton.func_146113_a(mc.getSoundHandler());
}
}
void nextPage() {
if(rightButton.enabled) {
actionPerformed(rightButton);
rightButton.func_146113_a(this.mc.getSoundHandler());
rightButton.func_146113_a(mc.getSoundHandler());
}
}
void prevPage() {
if(leftButton.enabled) {
actionPerformed(leftButton);
leftButton.func_146113_a(this.mc.getSoundHandler());
leftButton.func_146113_a(mc.getSoundHandler());
}
}
}
MODSRC/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java
+1 -5
View File
@@ -15,10 +15,6 @@ import java.util.Arrays;
import java.util.List;
import net.minecraft.client.Minecraft;
import net.minecraft.client.audio.PositionedSoundRecord;
import net.minecraft.client.audio.SoundHandler;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import org.lwjgl.opengl.GL11;
@@ -46,7 +42,7 @@ public class GuiButtonBack extends GuiButtonLexicon {
if(k == 2)
RenderHelper.renderTooltip(par2, par3 + tooltipY, tooltip);
}
public List<String> getTooltip() {
return Arrays.asList(StatCollector.translateToLocal("botaniamisc.back"));
}
MODSRC/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java
-1
View File
@@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.StatCollector;
import vazkii.botania.client.core.helper.RenderHelper;
MODSRC/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java
-1
View File
@@ -12,7 +12,6 @@
package vazkii.botania.client.gui.lexicon.button;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiButton;
public class GuiButtonInvisible extends GuiButtonLexicon {
MODSRC/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java
+4 -4
View File
@@ -23,8 +23,8 @@ public class GuiButtonLexicon extends GuiButton {
}
@Override
public void func_146113_a(SoundHandler p_146113_1_) {
p_146113_1_.playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("botania:lexiconPage"), 1.0F));
}
public void func_146113_a(SoundHandler p_146113_1_) {
p_146113_1_.playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("botania:lexiconPage"), 1.0F));
}
}
MODSRC/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java
-1
View File
@@ -14,7 +14,6 @@ package vazkii.botania.client.gui.lexicon.button;
import java.util.Arrays;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.util.StatCollector;
import org.lwjgl.opengl.GL11;
MODSRC/vazkii/botania/client/render/item/RenderGlassPick.java
+1 -6
View File
@@ -11,8 +11,6 @@
*/
package vazkii.botania.client.render.item;
import java.awt.Color;
import net.minecraft.client.renderer.ItemRenderer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.item.ItemStack;
@@ -21,9 +19,6 @@ import net.minecraftforge.client.IItemRenderer;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.mana.ILens;
import vazkii.botania.common.item.ItemLens;
public class RenderGlassPick implements IItemRenderer {
@Override
@@ -81,5 +76,5 @@ public class RenderGlassPick implements IItemRenderer {
GL11.glColor4f(1F, 1F, 1F, 1F);
}
}
MODSRC/vazkii/botania/client/render/tile/RenderTileStarfield.java
+14 -16
View File
@@ -36,8 +36,6 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer {
private static final ResourceLocation field_147526_d = new ResourceLocation("textures/entity/end_portal.png");
private static final Random field_147527_e = new Random(31100L);
FloatBuffer field_147528_b = GLAllocation.createDirectFloatBuffer(16);
private static final String __OBFID = "CL_00000972";
@Override
public void renderTileEntityAt(TileEntity p_147500_1_, double p_147500_2_, double p_147500_4_, double p_147500_6_, float p_147500_8_) {
float f1 = (float)field_147501_a.field_147560_j;
@@ -49,7 +47,7 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer {
for(int i = 0; i < 16; ++i) {
GL11.glPushMatrix();
float f5 = (float)(16 - i);
float f5 = 16 - i;
float f6 = 0.0625F;
float f7 = 1.0F / (f5 + 1.0F);
@@ -69,11 +67,11 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer {
f6 = 0.5F;
}
float f8 = (float)(-(p_147500_4_ + (double)f4));
float f8 = (float)-(p_147500_4_ + f4);
float f9 = f8 + ActiveRenderInfo.objectY;
float f10 = f8 + f5 + ActiveRenderInfo.objectY;
float f11 = f9 / f10;
f11 += (float)(p_147500_4_ + (double)f4);
f11 += (float)(p_147500_4_ + f4);
GL11.glTranslatef(f1, f11, f3);
GL11.glTexGeni(GL11.GL_S, GL11.GL_TEXTURE_GEN_MODE, GL11.GL_OBJECT_LINEAR);
GL11.glTexGeni(GL11.GL_T, GL11.GL_TEXTURE_GEN_MODE, GL11.GL_OBJECT_LINEAR);
@@ -91,10 +89,10 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer {
GL11.glMatrixMode(GL11.GL_TEXTURE);
GL11.glPushMatrix();
GL11.glLoadIdentity();
GL11.glTranslatef(0.0F, (float)(Minecraft.getSystemTime() % 20000L) / 20000.0F, 0.0F);
GL11.glTranslatef(0.0F, Minecraft.getSystemTime() % 20000L / 20000.0F, 0.0F);
GL11.glScalef(f6, f6, f6);
GL11.glTranslatef(0.5F, 0.5F, 0.0F);
GL11.glRotatef((float)(i * i * 4321 + i * 9) * 2.0F, 0.0F, 0.0F, 1.0F);
GL11.glRotatef((i * i * 4321 + i * 9) * 2.0F, 0.0F, 0.0F, 1.0F);
GL11.glTranslatef(-0.5F, -0.5F, 0.0F);
GL11.glTranslatef(-f1, -f3, -f2);
f9 = f8 + ActiveRenderInfo.objectY;
@@ -102,16 +100,16 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer {
Tessellator tessellator = Tessellator.instance;
tessellator.startDrawingQuads();
Color color = Color.getHSBColor((float) ((Minecraft.getSystemTime() / 20F) % 360) / 360F, 1F, 1F);
f11 = (float) color.getRed() / 255F;
float f12 = (float) color.getGreen() / 255F;
float f13 = (float) color.getBlue() / 255F;
Color color = Color.getHSBColor(Minecraft.getSystemTime() / 20F % 360 / 360F, 1F, 1F);
f11 = color.getRed() / 255F;
float f12 = color.getGreen() / 255F;
float f13 = color.getBlue() / 255F;
tessellator.setColorRGBA_F(f11 * f7, f12 * f7, f13 * f7, 1.0F);
tessellator.addVertex(p_147500_2_, p_147500_4_ + (double)f4, p_147500_6_);
tessellator.addVertex(p_147500_2_, p_147500_4_ + (double)f4, p_147500_6_ + 1.0D);
tessellator.addVertex(p_147500_2_ + 1.0D, p_147500_4_ + (double)f4, p_147500_6_ + 1.0D);
tessellator.addVertex(p_147500_2_ + 1.0D, p_147500_4_ + (double)f4, p_147500_6_);
tessellator.addVertex(p_147500_2_, p_147500_4_ + f4, p_147500_6_);
tessellator.addVertex(p_147500_2_, p_147500_4_ + f4, p_147500_6_ + 1.0D);
tessellator.addVertex(p_147500_2_ + 1.0D, p_147500_4_ + f4, p_147500_6_ + 1.0D);
tessellator.addVertex(p_147500_2_ + 1.0D, p_147500_4_ + f4, p_147500_6_);
tessellator.draw();
GL11.glPopMatrix();
GL11.glMatrixMode(GL11.GL_MODELVIEW);
MODSRC/vazkii/botania/common/block/BlockOpenCrate.java
+4 -5
View File
@@ -32,7 +32,6 @@ import vazkii.botania.api.wand.IWandable;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.common.block.tile.TileCraftCrate;
import vazkii.botania.common.block.tile.TileOpenCrate;
import vazkii.botania.common.block.tile.TileRuneAltar;
import vazkii.botania.common.block.tile.TileSimpleInventory;
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
import vazkii.botania.common.lexicon.LexiconData;
@@ -45,7 +44,7 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I
IIcon iconBottom;
IIcon iconSideCraft;
IIcon iconBottomCraft;
Random random;
private static final int SUBTYPES = 2;
@@ -55,7 +54,7 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I
setHardness(2.0F);
setStepSound(soundTypeWood);
setBlockName(LibBlockNames.OPEN_CRATE);
random = new Random();
}
@@ -80,7 +79,7 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I
public int damageDropped(int meta) {
return meta;
}
@Override
public boolean hasComparatorInputOverride() {
@@ -92,7 +91,7 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I
TileOpenCrate crate = (TileOpenCrate) par1World.getTileEntity(par2, par3, par4);
return crate.getSignal();
}
@Override
public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) {
TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(par2, par3, par4);
MODSRC/vazkii/botania/common/block/BlockRuneAltar.java
-1
View File
@@ -27,7 +27,6 @@ import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.wand.IWandable;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.common.block.tile.TileForestEye;
import vazkii.botania.common.block.tile.TileRuneAltar;
import vazkii.botania.common.block.tile.TileSimpleInventory;
import vazkii.botania.common.lexicon.LexiconData;
MODSRC/vazkii/botania/common/block/ModBlocks.java
+2 -2
View File
@@ -288,7 +288,7 @@ public final class ModBlocks {
customBrick = new BlockCustomBrick();
enderEye = new BlockEnderEye();
starfield = new BlockStarfield();
livingwoodStairs = new BlockLivingwoodStairs();
livingwoodSlab = new BlockLivingwoodSlab(false);
livingwoodSlabFull = new BlockLivingwoodSlab(true);
@@ -465,7 +465,7 @@ public final class ModBlocks {
registerTile(TileSpawnerClaw.class, LibBlockNames.SPAWNER_CLAW);
registerTile(TileEnderEye.class, LibBlockNames.ENDER_EYE_BLOCK);
registerTile(TileStarfield.class, LibBlockNames.STARFIELD);
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_PUREDAISY, SubTilePureDaisy.class);
BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MANASTAR, SubTileManastar.class);
MODSRC/vazkii/botania/common/block/decor/BlockStarfield.java
+4 -5
View File
@@ -21,7 +21,6 @@ import net.minecraft.world.World;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.client.lib.LibRenderIDs;
import vazkii.botania.common.block.BlockModContainer;
import vazkii.botania.common.block.tile.TileStarfield;
import vazkii.botania.common.lexicon.LexiconData;
@@ -30,17 +29,17 @@ import vazkii.botania.common.lib.LibBlockNames;
public class BlockStarfield extends BlockModContainer implements ILexiconable {
IIcon[] icons;
public BlockStarfield() {
super(Material.iron);
setHardness(5F);
setResistance(2000F);
setStepSound(soundTypeMetal);
setBlockName(LibBlockNames.STARFIELD);
setBlockBounds(0F, 0F, 0F, 1F, 0.25F, 1F);
}
@Override
public void registerBlockIcons(IIconRegister par1IconRegister) {
icons = new IIcon[3];
@@ -52,7 +51,7 @@ public class BlockStarfield extends BlockModContainer implements ILexiconable {
public IIcon getIcon(int par1, int par2) {
return icons[Math.min(2, par1)];
}
@Override
public boolean renderAsNormalBlock() {
return false;
MODSRC/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java
+1 -1
View File
@@ -77,7 +77,7 @@ public class SubTileHydroangeas extends SubTileGenerating {
public Block getBlockToSearchFor() {
return Blocks.water;
}
public Block getBlockToSearchBelow() {
return null;
}
MODSRC/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class SubTileThermalily extends SubTileHydroangeas {
public Block getBlockToSearchBelow() {
return ConfigHandler.thermalilyObsidian ? Blocks.obsidian : null;
}
@Override
public int getDelayBetweenPassiveGeneration() {
return 1;
MODSRC/vazkii/botania/common/block/tile/TileCraftCrate.java
+4 -4
View File
@@ -24,7 +24,7 @@ import vazkii.botania.common.item.ModItems;
public class TileCraftCrate extends TileOpenCrate {
int signal = 0;
@Override
public int getSizeInventory() {
return 10;
@@ -44,12 +44,12 @@ public class TileCraftCrate extends TileOpenCrate {
public void updateEntity() {
if(!worldObj.isRemote && craft(true) && canEject())
ejectAll();
int newSignal = 0;
for(; newSignal < 9; newSignal++) // dis for loop be derpy
if(getStackInSlot(newSignal) == null)
break;
if(newSignal != signal) {
signal = newSignal;
worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord));
@@ -117,7 +117,7 @@ public class TileCraftCrate extends TileOpenCrate {
ejectAll();
return true;
}
@Override
public int getSignal() {
return signal;
MODSRC/vazkii/botania/common/block/tile/TileOpenCrate.java
+1 -1
View File
@@ -68,7 +68,7 @@ public class TileOpenCrate extends TileSimpleInventory {
public boolean onWanded(EntityPlayer player, ItemStack stack) {
return false;
}
public int getSignal() {
return 0;
}
MODSRC/vazkii/botania/common/block/tile/TilePlatform.java
+6 -7
View File
@@ -13,7 +13,6 @@ package vazkii.botania.common.block.tile;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChunkCoordinates;
import net.minecraftforge.common.util.ForgeDirection;
import vazkii.botania.api.mana.IManaCollisionGhost;
@@ -23,7 +22,7 @@ public class TilePlatform extends TileCamo implements IManaCollisionGhost {
public boolean isGhost() {
return true;
}
public boolean onWanded(EntityPlayer player) {
if(player != null) {
if(player.isSneaking())
@@ -31,15 +30,15 @@ public class TilePlatform extends TileCamo implements IManaCollisionGhost {
else swapSurroudings(this, false);
return true;
}
return false;
}
void swapSelfAndPass(TilePlatform tile, boolean empty) {
swap(tile, empty);
swapSurroudings(tile, empty);
}
void swapSurroudings(TilePlatform tile, boolean empty) {
for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
int x = tile.xCoord + dir.offsetX;
@@ -53,11 +52,11 @@ public class TilePlatform extends TileCamo implements IManaCollisionGhost {
}
}
}
void swap(TilePlatform tile, boolean empty) {
tile.camo = empty ? null : camo;
tile.camoMeta = empty ? 0 : camoMeta;
worldObj.markBlockForUpdate(tile.xCoord, tile.yCoord, tile.zCoord);
}
}
MODSRC/vazkii/botania/common/block/tile/TileRuneAltar.java
+3 -3
View File
@@ -96,14 +96,14 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor
cooldown--;
Botania.proxy.wispFX(getWorldObj(), xCoord + Math.random(), yCoord + 0.8, zCoord + Math.random(), 0.2F, 0.2F, 0.2F, 0.2F, -0.025F);
}
int newSignal = 0;
if(manaToGet > 0) {
newSignal++;
if(mana >= manaToGet)
newSignal++;
}
if(newSignal != signal) {
signal = newSignal;
worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord));
@@ -185,7 +185,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor
Botania.proxy.sparkleFX(worldObj, xCoord + 0.5 + Math.random() * 0.4 - 0.2, yCoord + 1, zCoord + 0.5 + Math.random() * 0.4 - 0.2, red, green, blue, (float) Math.random(), 10);
}
}
@Override
public void writeCustomNBT(NBTTagCompound par1nbtTagCompound) {
super.writeCustomNBT(par1nbtTagCompound);
MODSRC/vazkii/botania/common/block/tile/TileStarfield.java
+6 -6
View File
@@ -19,26 +19,26 @@ public class TileStarfield extends TileMod {
public void updateEntity() {
if(worldObj.isDaytime())
return;
double radius = 512;
int iter = 2;
for(int i = 0; i < iter; i++) {
double x = xCoord + 0.5 + (Math.random() - 0.5) * radius;
double y = yCoord + 256;
double z = zCoord + 0.5 + (Math.random() - 0.5) * radius;
float w = 0.6F;
float c = 1F - w;
float r = w + (float) Math.random() * c;
float g = w + (float) Math.random() * c;
float b = w + (float) Math.random() * c;
float s = 20F + (float) Math.random() * 20F;
int m = 50;
Botania.proxy.sparkleFX(worldObj, x, y, z, r, g, b, s, m);
}
}
}
MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java
+4 -4
View File
@@ -37,7 +37,7 @@ public final class ConfigHandler {
public static boolean elfPortalParticlesEnabled = true;
public static boolean chargingAnimationEnabled = true;
public static boolean useVanillaParticleLimiter = true;
public static boolean altFlowerTextures = false;
public static boolean matrixMode = false;
public static boolean referencesEnabled = true;
@@ -114,7 +114,7 @@ public final class ConfigHandler {
desc = "Set to false to always display all particles regardless of the \"Particles\" setting in the Vanilla options menu.";
useVanillaParticleLimiter = loadPropBool("vanillaParticleConfig.enabled", desc, useVanillaParticleLimiter);
desc = "Set to true to use alternate flower textures by Futureazoo, not all flowers are textured. http://redd.it/2b3o3f";
altFlowerTextures = loadPropBool("flowerTextures.alt", desc, altFlowerTextures);
@@ -135,10 +135,10 @@ public final class ConfigHandler {
desc = "Set to false to disable the ability for the Hand of Ender to pickpocket other players' ender chests.";
enderPickpocketEnabled = loadPropBool("enderPickpocket.enabled", desc, enderPickpocketEnabled);
desc = "Set to true to only allow the Thermalily to absorb Lava if there's Obsidian below it. Another config option for the Blood Magic balance freaks.";
thermalilyObsidian = loadPropBool("thermalily.obsidian", desc, thermalilyObsidian);
desc = "Set to false to disable the Fallen Kanade flower (gives Regeneration). This config option is here for those using Blood Magic. Note: Turning this off will not remove ones already in the world, it'll simply prevent the crafting.";
fallenKanadeEnabled = loadPropBool("fallenKanade.enabled", desc, fallenKanadeEnabled);
MODSRC/vazkii/botania/common/core/handler/SpawnerChangingHandler.java
+1 -1
View File
@@ -26,7 +26,7 @@ public final class SpawnerChangingHandler {
public void onInteract(PlayerInteractEvent event) {
if(event.entityPlayer == null || event.entityPlayer.capabilities == null || event.world == null)
return; // Cauldron breaks stuff
if(event.entityPlayer.capabilities.isCreativeMode && !event.world.isRemote && event.action == Action.RIGHT_CLICK_BLOCK && !event.entityPlayer.isSneaking()) {
ItemStack stack = event.entityPlayer.getCurrentEquippedItem();
if(stack != null && stack.getItem() == Items.spawn_egg) {
MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java
+1 -1
View File
@@ -99,7 +99,7 @@ public class CommonProxy {
public boolean isTheClientPlayer(EntityLivingBase entity) {
return false;
}
public void setExtraReach(EntityLivingBase entity, float reach) {
if(entity instanceof EntityPlayerMP)
((EntityPlayerMP) entity).theItemInWorldManager.setBlockReachDistance(((EntityPlayerMP) entity).theItemInWorldManager.getBlockReachDistance() + reach);
MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java
+4 -4
View File
@@ -1033,7 +1033,7 @@ public final class ModCrafingRecipes {
for(int i = 1; i < 20; i++)
addShapelessOreDictRecipe(new ItemStack(ModItems.laputaShard, 1, i), LibOreDict.LIFE_ESSENCE,new ItemStack(ModItems.laputaShard, 1, i - 1));
recipesLaputaShardUpgrade = BotaniaAPI.getLatestAddedRecipes(19);
// Necrodermal Virus Recipe
addShapelessOreDictRecipe(new ItemStack(ModItems.virus), LibOreDict.PIXIE_DUST, new ItemStack(ModItems.vineBall), new ItemStack(Items.magma_cream), new ItemStack(Items.fermented_spider_eye), new ItemStack(Items.ender_eye), new ItemStack(Items.skull, 1, 2));
recipeVirusZombie = BotaniaAPI.getLatestAddedRecipe();
@@ -1162,15 +1162,15 @@ public final class ModCrafingRecipes {
'I', LibOreDict.MANA_STEEL,
'T', LibOreDict.LIVINGWOOD_TWIG);
recipeGlassPick = BotaniaAPI.getLatestAddedRecipe();
// Starfield Creator Recipe
addOreDictRecipe(new ItemStack(ModBlocks.starfield),
addOreDictRecipe(new ItemStack(ModBlocks.starfield),
"EPE", "EOE",
'E', LibOreDict.ELEMENTIUM,
'P', LibOreDict.PIXIE_DUST,
'O', new ItemStack(Blocks.obsidian));
recipeStarfield = BotaniaAPI.getLatestAddedRecipe();
// Mana and Terrasteel Block Recipes
addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0),
"III", "III", "III",
MODSRC/vazkii/botania/common/item/ItemTerraformRod.java
+1 -1
View File
@@ -85,7 +85,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem {
if(yCenter < 62) // Not below sea level
return;
int yStart = yCenter + range;
List<CoordsWithBlock> blocks = new ArrayList();
MODSRC/vazkii/botania/common/item/ModItems.java
+1 -1
View File
@@ -233,7 +233,7 @@ public final class ModItems {
superLavaPendant = new ItemSuperLavaPendant();
enderHand = new ItemEnderHand();
glassPick = new ItemGlassPick();
OreDictionary.registerOre(LibOreDict.LEXICON, lexicon);
for(int i = 0; i < 16; i++) {
OreDictionary.registerOre(LibOreDict.PETAL[i], new ItemStack(petal, 1, i));
MODSRC/vazkii/botania/common/item/equipment/bauble/ItemBauble.java
+2 -2
View File
@@ -45,14 +45,14 @@ public abstract class ItemBauble extends ItemMod implements IBauble {
if(baubles.isItemValidForSlot(i, par1ItemStack)) {
ItemStack stackInSlot = baubles.getStackInSlot(i);
if(stackInSlot == null || ((IBauble) stackInSlot.getItem()).canUnequip(stackInSlot, par3EntityPlayer)) {
if(!par2World.isRemote) {
if(!par2World.isRemote) {
baubles.setInventorySlotContents(i, par1ItemStack.copy());
if(!par3EntityPlayer.capabilities.isCreativeMode)
par3EntityPlayer.inventory.setInventorySlotContents(par3EntityPlayer.inventory.currentItem, null);
}
onEquipped(par1ItemStack, par3EntityPlayer);
if(stackInSlot != null) {
((IBauble) stackInSlot.getItem()).onUnequipped(stackInSlot, par3EntityPlayer);
return stackInSlot.copy();
MODSRC/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java
+1 -1
View File
@@ -62,7 +62,7 @@ public class ItemItemFinder extends ItemBauble {
public void tickClient(ItemStack stack, EntityPlayer player) {
if(!Botania.proxy.isTheClientPlayer(player))
return;
String pos = ItemNBTHelper.getString(stack, TAG_POSITIONS, "");
String[] tokens = pos.split(";");
for(String token : tokens) {
MODSRC/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java
+5 -4
View File
@@ -24,20 +24,21 @@ public class ItemGlassPick extends ItemManasteelPick {
private static final int MANA_PER_DAMAGE = 160;
private static final ToolMaterial MATERIAL = EnumHelper.addToolMaterial("MANASTEEL_GLASS", 0, 125, 4.8F, 1F, 10);
public ItemGlassPick() {
super(MATERIAL, LibItemNames.GLASS_PICK);
MinecraftForge.EVENT_BUS.register(this);
}
@SubscribeEvent
public void onBlockDrops(HarvestDropsEvent event) {
if(event.harvester != null && event.block != null && event.harvester.getCurrentEquippedItem() != null && event.harvester.getCurrentEquippedItem().getItem() == this && event.block.getMaterial() == Material.glass && event.block.canSilkHarvest(event.world, event.harvester, event.x, event.y, event.z, event.blockMetadata))
event.drops.add(new ItemStack(event.block, 1, event.blockMetadata));
}
@Override
public int getManaPerDmg() {
return MANA_PER_DAMAGE;
}
}
MODSRC/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java
+1 -1
View File
@@ -74,7 +74,7 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem {
return true;
}
public int getManaPerDmg() {
return MANA_PER_DAMAGE;
}
MODSRC/vazkii/botania/common/lexicon/LexiconData.java
+2 -2
View File
@@ -496,7 +496,7 @@ public final class LexiconData {
glassPick = new BLexiconEntry(LibLexicon.TOOL_GLASS_PICK, categoryTools);
glassPick.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeGlassPick));
// BAUBLES ENTRIES
baublesIntro = new BLexiconEntry(LibLexicon.BAUBLE_INTRO, categoryBaubles);
baublesIntro.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_BAUBLES), new PageText("2"));
@@ -606,7 +606,7 @@ public final class LexiconData {
azulejo = new BLexiconEntry(LibLexicon.MISC_AZULEJO, categoryMisc);
azulejo.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_AZULEJOS), new PageCraftingRecipe("2", ModCrafingRecipes.recipeAzulejo), new PageCraftingRecipe("3", ModCrafingRecipes.recipesAzulejoCycling));
starfield = new ALexiconEntry(LibLexicon.MISC_STARFIELD, categoryMisc);
starfield.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeStarfield));
}