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

Cleanup...

Browse Source
This commit is contained in:
Vasco Lavos committed 2014-03-07 21:46:16 +00:00
1 parent d49063c8b0
commit 3bd773b17c
26 files changed
+84 -56
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

MODSRC/vazkii/botania/client/core/handler/HUDHandler.java
+2 -2
View File
@@ -112,10 +112,10 @@ public final class HUDHandler {
RenderHelper.drawTexturedModalRect(x, y, 0, 0, 0, 102, 5);
int manaPercentage = Math.max(0, (int) ((double) mana / (double) maxMana * 100));
if(manaPercentage == 0 && mana > 0)
manaPercentage = 1;
RenderHelper.drawTexturedModalRect(x + 1 + manaPercentage, y + 1, 0, 0, 5, 100 - manaPercentage, 3);
Color color_ = new Color(color);
MODSRC/vazkii/botania/client/core/helper/RenderHelper.java
+2 -2
View File
@@ -35,7 +35,7 @@ public final class RenderHelper {
renderTooltip(x, y, tooltipData, color, color2);
}
public static void renderTooltipGreen(int x, int y, List<String> tooltipData) {
int color = 0x5000a000;
int color2 = 0xf0001e00;
@@ -74,7 +74,7 @@ public final class RenderHelper {
drawGradientRect(var6 + var5 + 2, var7 - 3 + 1, z, var6 + var5 + 3, var7 + var9 + 3 - 1, color, var12);
drawGradientRect(var6 - 3, var7 - 3, z, var6 + var5 + 3, var7 - 3 + 1, color, color);
drawGradientRect(var6 - 3, var7 + var9 + 2, z, var6 + var5 + 3, var7 + var9 + 3, var12, var12);
GL11.glDisable(GL11.GL_DEPTH_TEST);
for (int var13 = 0; var13 < tooltipData.size(); ++var13) {
String var14 = tooltipData.get(var13);
MODSRC/vazkii/botania/client/gui/GuiLexiconEntry.java
-1
View File
@@ -17,7 +17,6 @@ import net.minecraft.util.StatCollector;
import vazkii.botania.api.internal.IGuiLexiconEntry;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.lexicon.LexiconPage;
import vazkii.botania.client.gui.button.GuiButtonBack;
import vazkii.botania.client.gui.button.GuiButtonBackWithShift;
import vazkii.botania.client.gui.button.GuiButtonPage;
MODSRC/vazkii/botania/client/gui/button/GuiButtonBack.java
+1 -2
View File
@@ -16,7 +16,6 @@ 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 org.lwjgl.opengl.GL11;
@@ -44,7 +43,7 @@ public class GuiButtonBack extends GuiButton {
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/button/GuiButtonBackWithShift.java
+1 -1
View File
@@ -22,7 +22,7 @@ public class GuiButtonBackWithShift extends GuiButtonBack {
public GuiButtonBackWithShift(int par1, int par2, int par3) {
super(par1, par2, par3);
}
@Override
public List<String> getTooltip() {
return Arrays.asList(StatCollector.translateToLocal("botaniamisc.back"), EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.clickToIndex"));
MODSRC/vazkii/botania/common/block/BlockLivingrock.java
+1 -1
View File
@@ -48,7 +48,7 @@ public class BlockLivingrock extends BlockMod implements ILexiconable {
protected boolean shouldRegisterInNameSet() {
return false;
}
@Override
public int damageDropped(int par1) {
return par1;
MODSRC/vazkii/botania/common/block/BlockLivingwood.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class BlockLivingwood extends BlockMod implements ILexiconable {
public int damageDropped(int par1) {
return par1;
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
MODSRC/vazkii/botania/common/block/BlockPool.java
+4 -4
View File
@@ -76,20 +76,20 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable,
public int getRenderType() {
return LibRenderIDs.idPool;
}
@Override
public boolean hasComparatorInputOverride() {
return true;
}
@Override
public int getComparatorInputOverride(World par1World, int par2, int par3, int par4, int par5) {
TilePool pool = (TilePool) par1World.getBlockTileEntity(par2, par3, par4);
int val = (int) ((double) pool.getCurrentMana() / (double) TilePool.MAX_MANA * 15.0);
if(pool.getCurrentMana() > 0)
val = Math.max(val, 1);
return val;
return val;
}
@Override
MODSRC/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java
+1 -1
View File
@@ -66,7 +66,7 @@ public class SubTileJadedAmaranthus extends SubTileFunctional {
public LexiconEntry getEntry() {
return LexiconData.jadedAmaranthus;
}
@Override
public int getMaxMana() {
return COST;
MODSRC/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java
+2 -2
View File
@@ -49,7 +49,7 @@ public class SubTileEndoflame extends SubTileGenerating {
this.burnTime = burnTime / 2;
stack.stackSize--;
if(stack.stackSize == 0)
item.setDead();
@@ -66,7 +66,7 @@ public class SubTileEndoflame extends SubTileGenerating {
} else {
if(supertile.worldObj.rand.nextInt(8) == 0)
Botania.proxy.wispFX(supertile.worldObj, supertile.xCoord + 0.55 + Math.random() * 0.2 - 0.1, supertile.yCoord + 0.55 + Math.random() * 0.2 - 0.1, supertile.zCoord + 0.5, 0.7F, 0.05F, 0.05F, (float) Math.random() / 6, (float) -Math.random() / 60);
burnTime--;
}
}
MODSRC/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java
+1 -1
View File
@@ -1,12 +1,12 @@
package vazkii.botania.common.block.subtile.generating;
import cpw.mods.fml.common.network.PacketDispatcher;
import net.minecraft.block.Block;
import net.minecraft.nbt.NBTTagCompound;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.SubTileGenerating;
import vazkii.botania.common.Botania;
import vazkii.botania.common.lexicon.LexiconData;
import cpw.mods.fml.common.network.PacketDispatcher;
public class SubTileHydroangeas extends SubTileGenerating {
MODSRC/vazkii/botania/common/block/tile/TilePool.java
+2 -2
View File
@@ -134,7 +134,7 @@ public class TilePool extends TileMod implements IManaPool {
ItemStack stack = item.getEntityItem();
if(stack != null && stack.getItem() instanceof IManaItem) {
IManaItem mana = (IManaItem) stack.getItem();
if((outputting && mana.canReceiveManaFromPool(stack, this)) || (!outputting && mana.canExportManaToPool(stack, this))) {
if(outputting && mana.canReceiveManaFromPool(stack, this) || !outputting && mana.canExportManaToPool(stack, this)) {
boolean didSomething = false;
if(outputting) {
@@ -192,7 +192,7 @@ public class TilePool extends TileMod implements IManaPool {
nbttagcompound.setInteger(TAG_KNOWN_MANA, getCurrentMana());
PacketDispatcher.sendPacketToPlayer(new Packet132TileEntityData(xCoord, yCoord, zCoord, -999, nbttagcompound), (Player) player);
}
worldObj.playSoundAtEntity(player, "random.orb", 0.11F, 1F);
}
MODSRC/vazkii/botania/common/block/tile/TileSpreader.java
+1 -1
View File
@@ -328,7 +328,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector
burst.getCollidedTile(false);
}
}
@Override
public float getManaYieldMultiplier(IManaBurst burst) {
return burst.getMana() < 16 ? 0F : 0.95F;
MODSRC/vazkii/botania/common/core/handler/ManaNetworkHandler.java
+4 -4
View File
@@ -77,7 +77,7 @@ public final class ManaNetworkHandler implements IManaNetwork {
return closestTile;
}
private synchronized void remove(Map<Integer, List<TileEntity>> map, TileEntity tile) {
int dim = tile.worldObj.provider.dimensionId;
@@ -100,17 +100,17 @@ public final class ManaNetworkHandler implements IManaNetwork {
if(!tiles.contains(tile))
tiles.add(tile);
}
@Override
public List<TileEntity> getAllCollectorsInWorld(int dim) {
return getAllInWorld(manaCollectors, dim);
}
@Override
public List<TileEntity> getAllPoolsInWorld(int dim) {
return getAllInWorld(manaPools, dim);
}
private List<TileEntity> getAllInWorld(Map<Integer, List<TileEntity>> map, int dim) {
if(!map.containsKey(dim))
return new ArrayList();
MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java
+17 -5
View File
@@ -64,6 +64,7 @@ public final class ModCrafingRecipes {
public static List<IRecipe> recipesManaBeacons;
public static List<IRecipe> recipesSignalFlares;
public static IRecipe recipeManaVoid;
public static List<IRecipe> recipesManaTablet;
public static void init() {
// Lexicon Recipe
@@ -232,7 +233,7 @@ public final class ModCrafingRecipes {
'W', new ItemStack(ModBlocks.livingwood, 1, 1));
livingwoodDecorRecipe4 = BotaniaAPI.getLatestAddedRecipe();
// MANA BEACON RECIPES
// Mana Beacon Recipe
for(int i = 0; i < 16; i++)
addOreDictRecipe(new ItemStack(ModBlocks.manaBeacon, 1, i),
" B ", "BPB", " B ",
@@ -240,7 +241,7 @@ public final class ModCrafingRecipes {
'P', LibOreDict.MANA_PEARL);
recipesManaBeacons = BotaniaAPI.getLatestAddedRecipes(16);
// SIGNAL FLARE RECIPES
// Signal Flare Recipe
for(int i = 0; i < 16; i++)
addOreDictRecipe(ItemSignalFlare.forColor(i),
"I ", " B", "W ",
@@ -248,13 +249,24 @@ public final class ModCrafingRecipes {
'I', "ingotIron",
'W', LibOreDict.LIVING_WOOD);
recipesSignalFlares = BotaniaAPI.getLatestAddedRecipes(16);
// MANA VOID RECIPE
addOreDictRecipe(new ItemStack(ModBlocks.manaVoid),
// Mana Void Recipe
addOreDictRecipe(new ItemStack(ModBlocks.manaVoid),
"SSS", "O O", "SSS",
'S', LibOreDict.LIVING_ROCK,
'O', new ItemStack(Block.obsidian));
recipeManaVoid = BotaniaAPI.getLatestAddedRecipe();
// Mana Tablet Recipe
addOreDictRecipe(new ItemStack(ModItems.manaTablet, 1, 10000),
"SSS", "SPS", "SSS",
'S', LibOreDict.LIVING_ROCK,
'P', LibOreDict.MANA_PEARL);
addOreDictRecipe(new ItemStack(ModItems.manaTablet, 1, 10000),
"SSS", "SDS", "SSS",
'S', LibOreDict.LIVING_ROCK,
'D', LibOreDict.MANA_DIAMOND);
recipesManaTablet = BotaniaAPI.getLatestAddedRecipes(2);
}
private static void addOreDictRecipe(ItemStack output, Object... recipe) {
MODSRC/vazkii/botania/common/entity/EntityManaBurst.java
+1 -1
View File
@@ -325,7 +325,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst {
int mana = getMana();
if(tile instanceof IManaCollector)
mana *= ((IManaCollector) tile).getManaYieldMultiplier(this);
((IManaReceiver) tile).recieveMana(mana);
PacketDispatcher.sendPacketToAllInDimension(tile.getDescriptionPacket(), worldObj.provider.dimensionId);
}
MODSRC/vazkii/botania/common/item/ItemManaTablet.java
+17 -10
View File
@@ -12,8 +12,10 @@
package vazkii.botania.common.item;
import java.awt.Color;
import java.util.List;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon;
@@ -26,33 +28,38 @@ import vazkii.botania.common.lib.LibItemNames;
public class ItemManaTablet extends ItemMod implements IManaItem {
Icon[] icons;
private static final String TAG_MANA = "mana";
public ItemManaTablet() {
super(LibItemIDs.idManaTablet);
setMaxStackSize(1);
setMaxDamage(1000);
setUnlocalizedName(LibItemNames.MANA_TABLET);
}
@Override
public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) {
par3List.add(new ItemStack(par1, 1, 10000));
}
@Override
public int getColorFromItemStack(ItemStack par1ItemStack, int par2) {
float mana = getMana(par1ItemStack);
return par2 == 1 ? Color.HSBtoRGB(0.528F, mana / (float) getMaxMana(par1ItemStack), 1F) : 0xFFFFFF;
return par2 == 1 ? Color.HSBtoRGB(0.528F, mana / getMaxMana(par1ItemStack), 1F) : 0xFFFFFF;
}
@Override
public int getDamage(ItemStack stack) {
float mana = getMana(stack);
return 1000 - (int) ((mana / (float) getMaxMana(stack)) * 1000);
return 1000 - (int) (mana / getMaxMana(stack) * 1000);
}
@Override
public int getDisplayDamage(ItemStack stack) {
return getDamage(stack);
}
@Override
public void registerIcons(IconRegister par1IconRegister) {
icons = new Icon[2];
@@ -69,7 +76,7 @@ public class ItemManaTablet extends ItemMod implements IManaItem {
public boolean requiresMultipleRenderPasses() {
return true;
}
public static void setMana(ItemStack stack, int mana) {
ItemNBTHelper.setInt(stack, TAG_MANA, mana);
}
@@ -113,5 +120,5 @@ public class ItemManaTablet extends ItemMod implements IManaItem {
public boolean isPriorityItem(ItemStack stack) {
return false;
}
}
MODSRC/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class ItemBlockSpecialFlower extends ItemBlock implements ISpecialFlower
public String getUnlocalizedName(ItemStack stack) {
return "tile." + LibBlockNames.SPECIAL_FLOWER_PREFIX + getType(stack);
}
@Override
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
String refUnlocalized = "tile." + LibBlockNames.SPECIAL_FLOWER_PREFIX + getType(par1ItemStack) + ".reference";
MODSRC/vazkii/botania/common/lexicon/LexiconData.java
+6 -2
View File
@@ -60,6 +60,7 @@ public final class LexiconData {
public static LexiconEntry lensGravity;
public static LexiconEntry lensBore;
public static LexiconEntry lensDamaging;
public static LexiconEntry manaTransport;
public static LexiconEntry functionalIntro;
public static LexiconEntry jadedAmaranthus;
@@ -104,7 +105,7 @@ public final class LexiconData {
pureDaisy.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_PURE_DAISY), new PagePetalRecipe("2", ModPetalRecipes.pureDaisyRecipe));
LexiconRecipeMappings.map(new ItemStack(ModBlocks.livingwood), pureDaisy, 1);
LexiconRecipeMappings.map(new ItemStack(ModBlocks.livingrock), pureDaisy, 1);
runicAltar = new BLexiconEntry(LibLexicon.BASICS_RUNE_ALTAR, categoryBasics);
runicAltar.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCrafingRecipes.recipesRuneAltar), new PageText("3"), new PageRuneRecipe("4", ModRuneRecipes.recipeWaterRune), new PageRuneRecipe("5", ModRuneRecipes.recipeEarthRune), new PageRuneRecipe("6", ModRuneRecipes.recipeAirRune), new PageRuneRecipe("7", ModRuneRecipes.recipeFireRune),
new PageRuneRecipe("8", ModRuneRecipes.recipeSpringRune), new PageRuneRecipe("9", ModRuneRecipes.recipeSummerRune), new PageRuneRecipe("10", ModRuneRecipes.recipeAutumnRune), new PageRuneRecipe("11", ModRuneRecipes.recipeWinterRune), new PageRuneRecipe("12", ModRuneRecipes.recipeManaRune),
@@ -149,7 +150,10 @@ public final class LexiconData {
manaVoid = new BLexiconEntry(LibLexicon.MANA_VOID, categoryMana);
manaVoid.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeManaVoid));
manaTransport = new BLexiconEntry(LibLexicon.MANA_TRANSPORT, categoryMana);
manaTransport.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCrafingRecipes.recipesManaTablet));
// FUNCTIONAL FLOWERS ENTRIES
functionalIntro = new BLexiconEntry(LibLexicon.FFLOWER_INTRO, categoryFunctionalFlowers);
functionalIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"));
MODSRC/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class PageCraftingRecipe extends PageRecipe {
public PageCraftingRecipe(String unlocalizedName, IRecipe recipe) {
this(unlocalizedName, Arrays.asList(recipe));
}
@Override
public void onPageAdded(LexiconEntry entry, int index) {
for(IRecipe recipe : recipes)
MODSRC/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class PageManaInfusionRecipe extends PageRecipe {
public PageManaInfusionRecipe(String unlocalizedName, RecipeManaInfusion recipe) {
this(unlocalizedName, Arrays.asList(recipe));
}
@Override
public void onPageAdded(LexiconEntry entry, int index) {
for(RecipeManaInfusion recipe : recipes)
MODSRC/vazkii/botania/common/lexicon/page/PagePetalRecipe.java
+1 -1
View File
@@ -49,7 +49,7 @@ public class PagePetalRecipe<T extends RecipePetals> extends PageRecipe {
public PagePetalRecipe(String unlocalizedName, T recipe) {
this(unlocalizedName, Arrays.asList(recipe));
}
@Override
public void onPageAdded(LexiconEntry entry, int index) {
for(T recipe : recipes)
MODSRC/vazkii/botania/common/lexicon/page/PageRecipe.java
+7 -7
View File
@@ -66,16 +66,16 @@ public class PageRecipe extends LexiconPage {
RenderHelper.renderTooltip(mx, my, tooltipData);
int tooltipY = 8 + tooltipData.size() * 11;
if(tooltipEntry) {
RenderHelper.renderTooltipOrange(mx, my + tooltipY, Arrays.asList(EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.clickToRecipe")));
tooltipY += 18;
}
if(tooltipContainerStack != null)
RenderHelper.renderTooltipGreen(mx, my + tooltipY, Arrays.asList(EnumChatFormatting.AQUA + StatCollector.translateToLocal("botaniamisc.craftingContainer"), tooltipContainerStack.getDisplayName()));
}
tooltipStack = tooltipContainerStack = null;
tooltipEntry = false;
GL11.glDisable(GL11.GL_BLEND);
@@ -139,19 +139,19 @@ public class PageRecipe extends LexiconPage {
if(relativeMouseX >= xPos && relativeMouseY >= yPos && relativeMouseX <= xPos + 16 && relativeMouseY <= yPos + 16) {
tooltipStack = stack;
EntryData data = LexiconRecipeMappings.getDataForStack(tooltipStack);
if(data != null && (data.entry != gui.getEntry() || data.page != gui.getPageOn())) {
tooltipEntry = true;
if(Mouse.isButtonDown(0) && GuiScreen.isShiftKeyDown()) {
GuiLexiconEntry newGui = new GuiLexiconEntry(data.entry, (GuiScreen) gui);
newGui.page = data.page;
Minecraft.getMinecraft().displayGuiScreen(newGui);
}
}
if(accountForContainer) {
ItemStack containerStack = stack.getItem().getContainerItemStack(stack);
if(containerStack != null && containerStack.getItem() != null)
MODSRC/vazkii/botania/common/lib/LibLexicon.java
+2 -1
View File
@@ -43,7 +43,8 @@ public final class LibLexicon {
public static final String MANA_LENS_BORE = "lensBore";
public static final String MANA_LENS_DAMAGING = "lensDamaging";
public static final String MANA_VOID = "manaVoid";
public static final String MANA_TRANSPORT = "manaTransport";
public static final String FFLOWER_INTRO = "fIntro";
public static final String FFLOWER_JADED_AMARANTHUS = "jadedAmaranthus";
public static final String FFLOWER_BELLETHORNE = "bellethorne";
MODSRC/vazkii/botania/common/lib/LibObfuscation.java
+1 -1
View File
@@ -27,7 +27,7 @@ public final class LibObfuscation {
// EntityCreeper
public static final String[] TIME_SINCE_IGNITED = new String[] { "timeSinceIgnited", "field_70833_d", "bq" };
// ThreadDownloadImageData
public static final String[] TEXTURE_UPLOADED = new String[] { "textureUploaded", "field_110559_g", "g" };
public static final String[] BUFFERED_IMAGE = new String[] { "bufferedImage", "field_110560_d", "d" };
resources/assets/botania/lang/en_US.lang
+6
View File
@@ -360,6 +360,12 @@ botania.entry.lensDamaging=Mana Lens: Damaging
botania.page.lensDamaging0=The &1Damaging Lens&0 charges the &4Mana Burst&0 with the power to damage any living beings it comes across, draining it's own mana to do so.
botania.page.lensDamaging1=Crafting the lens
# -- PORTABLE MANA TRANSPORT
botania.entry.manaTransport=Portable Mana Transport
botania.page.manaTransport0=While using &1Mana Spreaders&0 to transport &4Mana&0 around is all well and good, there is also a way of doing it in a different manner.<br>The &1Mana Tablet&0 is a portable object which can carry &4Mana&0 on itself.
botania.page.manaTransport1=Tossing one of these on top of a &1Mana Pool&0 will allow for transport of &4Mana&0 between one and another.<br>Shift-right clicking the &1Mana Pool&0 with a &1Wand of the Forest&0 will change in which way the &4Mana&0 flows.
botania.page.manaTransport2=This doesn't run android
# - FUNCTIONAL FLOWERS
# -- AN INTRODUCTION TO FUNCTION
botania.entry.fIntro=An Introduction to Function