Merge upstream

This commit is contained in:
Vincent Lee committed 2015-11-20 01:00:31 -06:00
commit e3b22975cb
73 files changed
+363 -47

No files matched your search

@@ -0,0 +1,27 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [17/11/2015, 20:10:53 (GMT)]
*/
package vazkii.botania.api.item;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import vazkii.botania.api.subtile.SubTileEntity;
/**
* An Item that implements this can be placed by a Rannuncarpus.
*/
public interface IFlowerPlaceable {
/**
* Gets the block to be placed, return null to not place anything.
*/
public Block getBlockToPlaceByFlower(ItemStack stack, SubTileEntity flower, int x, int y, int z);
public void onBlockPlacedByFlower(ItemStack stack, SubTileEntity flower, int x, int y, int z);
}
@@ -0,0 +1,138 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [17/11/2015, 18:33:30 (GMT)]
*/
package vazkii.botania.common.block;
import java.util.List;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.EnumPlantType;
import net.minecraftforge.common.IPlantable;
import net.minecraftforge.common.util.ForgeDirection;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.common.Botania;
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
import vazkii.botania.common.lib.LibBlockNames;
import cpw.mods.fml.common.registry.GameRegistry;
public class BlockAltGrass extends BlockMod {
private static final int SUBTYPES = 6;
IIcon[] icons;
public BlockAltGrass() {
super(Material.grass);
setHardness(0.6F);
setStepSound(soundTypeGrass);
setBlockName(LibBlockNames.ALT_GRASS);
}
@Override
public Block setBlockName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
return super.setBlockName(par1Str);
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
}
@Override
public void getSubBlocks(Item item, CreativeTabs tab, List list) {
for(int i = 0; i < 6; i++)
list.add(new ItemStack(item, 1, i));
}
@Override
public void registerBlockIcons(IIconRegister par1IconRegister) {
icons = new IIcon[SUBTYPES * 2];
for(int i = 0; i < icons.length; i++)
icons[i] = IconHelper.forBlock(par1IconRegister, this, i);
}
@Override
public IIcon getIcon(int side, int meta) {
return side == 0 || meta >= SUBTYPES ? Blocks.dirt.getIcon(side, meta) : side == 1 ? icons[meta * 2] : icons[meta * 2 + 1];
}
@Override
public void updateTick(World world, int x, int y, int z, Random rand) {
if(!world.isRemote && world.getBlockLightValue(x, y + 1, z) >= 9) {
int meta = world.getBlockMetadata(x, y, z);
for(int l = 0; l < 4; ++l) {
int i1 = x + rand.nextInt(3) - 1;
int j1 = y + rand.nextInt(5) - 3;
int k1 = z + rand.nextInt(3) - 1;
Block block = world.getBlock(i1, j1 + 1, k1);
if(world.getBlock(i1, j1, k1) == Blocks.dirt && world.getBlockMetadata(i1, j1, k1) == 0 && world.getBlockLightValue(i1, j1 + 1, k1) >= 4 && world.getBlockLightOpacity(i1, j1 + 1, k1) <= 2)
world.setBlock(i1, j1, k1, this, meta, 1 | 2);
}
}
}
@Override
public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
return Blocks.dirt.getItemDropped(0, p_149650_2_, p_149650_3_);
}
@Override
public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) {
return new ItemStack(this, 1, world.getBlockMetadata(x, y, z));
}
@Override
public boolean canSustainPlant(IBlockAccess world, int x, int y, int z, ForgeDirection direction, IPlantable plantable) {
return plantable.getPlantType(world, x, y - 1, z) == EnumPlantType.Plains;
}
@Override
public void randomDisplayTick(World world, int x, int y, int z, Random r) {
int meta = world.getBlockMetadata(x, y, z);
switch(meta) {
case 0: // Dry
break;
case 1: // Golden
break;
case 2: // Vivid
break;
case 3: // Scorched
if(r.nextInt(80) == 0)
world.spawnParticle("flame", x + r.nextFloat(), y + 1.1, z + r.nextFloat(), 0, 0, 0);
break;
case 4: // Infused
if(r.nextInt(100) == 0)
Botania.proxy.sparkleFX(world, x + r.nextFloat(), y + 1.05, z + r.nextFloat(), 0F, 1F, 1F, r.nextFloat() * 0.2F + 1F, 5);
break;
case 5: // Mutated
if(r.nextInt(100) == 0) {
if(r.nextInt(100) > 25)
Botania.proxy.sparkleFX(world, x + r.nextFloat(), y + 1.05, z + r.nextFloat(), 1F, 0F, 1F, r.nextFloat() * 0.2F + 1F, 5);
else Botania.proxy.sparkleFX(world, x + r.nextFloat(), y + 1.05, z + r.nextFloat(), 1F, 1F, 0F, r.nextFloat() * 0.2F + 1F, 5);
}
break;
}
}
}
@@ -12,6 +12,7 @@ package vazkii.botania.common.block;
import net.minecraft.block.Block;
import net.minecraft.block.BlockDispenser;
import net.minecraft.block.material.Material;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -267,6 +268,7 @@ public final class ModBlocks {
public static Block shimmerrock;
public static Block shimmerwoodPlanks;
public static Block avatar;
public static Block altGrass;
public static void init() {
flower = new BlockModFlower();
@@ -358,7 +360,8 @@ public final class ModBlocks {
shimmerrock = new BlockShimmerrock();
shimmerwoodPlanks = new BlockShimmerwoodPlanks();
avatar = new BlockAvatar();
altGrass = new BlockAltGrass();
ModFluffBlocks.init();
for(int i = 0; i < 16; i++)
@@ -134,8 +134,11 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab
IslandType type = null;
if(stack.getItem() == Items.snowball)
type = IslandType.SNOW;
else if(stack.getItem() == ModItems.grassSeeds)
type = ItemGrassSeeds.getIslandType(stack);
else if(stack.getItem() == ModItems.grassSeeds) {
IslandType newType = ItemGrassSeeds.getIslandType(stack);
if(newType != null)
type = newType;
}
if(type != null && type != flower.getIslandType()) {
if(!world.isRemote) {
@@ -68,9 +68,11 @@ public class SubTileExoflame extends SubTileFunctional {
IExoflameHeatable heatable = (IExoflameHeatable) tile;
if(heatable.canSmelt() && mana > 2) {
if(heatable.getBurnTime() == 0)
if(heatable.getBurnTime() == 0) {
heatable.boostBurnTime();
mana = Math.max(0, mana - cost);
mana = Math.max(0, mana - cost);
}
if(ticksExisted % 2 == 0)
heatable.boostCookTime();
@@ -103,6 +103,7 @@ public class SubTileHopperhock extends SubTileFunctional {
if(invToPutItemIn != null) {
InventoryHelper.insertItemIntoInventory(invToPutItemIn, stack.copy(), sideToPutItemIn, -1);
invToPutItemIn.markDirty();
item.setDead();
pulledAny = true;
}
@@ -32,6 +32,7 @@ import net.minecraft.world.World;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.item.IFlowerPlaceable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.ISubTileContainer;
import vazkii.botania.api.subtile.RadiusDescriptor;
@@ -83,7 +84,7 @@ public class SubTileRannuncarpus extends SubTileFunctional {
ItemStack stack = item.getEntityItem();
Item stackItem = stack.getItem();
if(stackItem instanceof ItemBlock || stackItem instanceof ItemReed || stackItem instanceof ItemRedstone) {
if(stackItem instanceof ItemBlock || stackItem instanceof ItemReed || stackItem instanceof ItemRedstone || stackItem instanceof IFlowerPlaceable) {
if(!scanned) {
for(int i = -rangePlace; i < rangePlace + 1; i++)
for(int j = -rangePlaceY; j < rangePlaceY + 1; j++)
@@ -101,8 +102,12 @@ public class SubTileRannuncarpus extends SubTileFunctional {
}
if(!validPositions.isEmpty() && !supertile.getWorld().isRemote) {
if(!validPositions.isEmpty() && !supertile.getWorldObj().isRemote) {
ChunkCoordinates coords = validPositions.get(supertile.getWorldObj().rand.nextInt(validPositions.size()));
Block blockToPlace = null;
if(stackItem instanceof IFlowerPlaceable)
blockToPlace = ((IFlowerPlaceable) stackItem).getBlockToPlaceByFlower(stack, this, coords.posX, coords.posY, coords.posZ);
if(stackItem instanceof ItemBlock)
blockToPlace = ((ItemBlock) stackItem).field_150939_a;
else if(stackItem instanceof ItemReed)
@@ -111,9 +116,14 @@ public class SubTileRannuncarpus extends SubTileFunctional {
blockToPlace = Blocks.redstone_wire;
if(blockToPlace != null) {
<<<<<<< HEAD
BlockPos coords = validPositions.get(supertile.getWorld().rand.nextInt(validPositions.size()));
if(blockToPlace.canPlaceBlockAt(supertile.getWorld(), coords.posX, coords.posY, coords.posZ)) {
supertile.getWorld().setBlock(coords.posX, coords.posY, coords.posZ, blockToPlace, stack.getItemDamage(), 1 | 2);
=======
if(blockToPlace.canPlaceBlockAt(supertile.getWorldObj(), coords.posX, coords.posY, coords.posZ)) {
supertile.getWorldObj().setBlock(coords.posX, coords.posY, coords.posZ, blockToPlace, stack.getItemDamage(), 1 | 2);
>>>>>>> 82051d95d9817a177f0ec62817f4f2430358b46e
if(ConfigHandler.blockBreakParticles)
supertile.getWorld().playAuxSFX(2001, coords.posX, coords.posY, coords.posZ, Block.getIdFromBlock(blockToPlace) + (stack.getItemDamage() << 12));
validPositions.remove(coords);
@@ -126,6 +136,9 @@ public class SubTileRannuncarpus extends SubTileFunctional {
SubTileEntity subtile = container.getSubTile();
subtile.onBlockPlacedBy(supertile.getWorld(), coords.posX, coords.posY, coords.posZ, null, stack);
}
if(stackItem instanceof IFlowerPlaceable)
((IFlowerPlaceable) stackItem).onBlockPlacedByFlower(stack, this, coords.posX, coords.posY, coords.posZ);
if(!supertile.getWorld().isRemote) {
stack.stackSize--;
@@ -21,6 +21,7 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.common.item.ModItems;
public class TileCraftCrate extends TileOpenCrate {
@@ -157,6 +158,7 @@ public class TileCraftCrate extends TileOpenCrate {
if(stack != null)
eject(stack, false);
setInventorySlotContents(i, null);
markDirty();
}
}
@@ -178,11 +180,18 @@ public class TileCraftCrate extends TileOpenCrate {
ejectAll();
return true;
}
@Override
public void markDirty() {
super.markDirty();
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this);
}
@Override
public int getSignal() {
return signal;
}
@Override
public void onDataPacket(NetworkManager manager, S35PacketUpdateTileEntity packet) {
int lastPattern = pattern;
@@ -65,7 +65,6 @@ public final class BotaniaCreativeTab extends CreativeTabs {
addItem(ModItems.dye);
addItem(ModItems.fertilizer);
addItem(ModItems.flowerBag);
addItem(ModItems.grassSeeds);
addItem(ModItems.blackLotus);
addItem(ModItems.twigWand);
addItem(ModItems.obedienceStick);
@@ -103,6 +102,8 @@ public final class BotaniaCreativeTab extends CreativeTabs {
addItem(ModItems.worldSeed);
addItem(ModItems.overgrowthSeed);
addBlock(ModBlocks.enchantedSoil);
addItem(ModItems.grassSeeds);
addBlock(ModBlocks.altGrass);
if(Botania.thaumcraftLoaded)
addItem(ModItems.manaInkwell);
addBlock(ModBlocks.forestDrum);
@@ -305,6 +305,7 @@ public final class ModCraftingRecipes {
public static IRecipe recipeTeruTeruBozu;
public static IRecipe recipeAvatar;
public static IRecipe recipeSextant;
public static List<IRecipe> recipesAltGrassSeeds;
// Garden of Glass
public static IRecipe recipeRootToSapling;
@@ -2053,6 +2054,15 @@ public final class ModCraftingRecipes {
'I', LibOreDict.MANA_STEEL);
recipeSextant = BotaniaAPI.getLatestAddedRecipe();
// Alternate Pasture Seed Recipes
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.grassSeeds, 1, 3), new ItemStack(ModItems.grassSeeds), new ItemStack(Blocks.deadbush));
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.grassSeeds, 1, 4), new ItemStack(ModItems.grassSeeds), new ItemStack(Items.wheat));
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.grassSeeds, 1, 5), new ItemStack(ModItems.grassSeeds), new ItemStack(Items.dye, 1, 2));
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.grassSeeds, 1, 6), new ItemStack(ModItems.grassSeeds), new ItemStack(Items.blaze_powder));
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.grassSeeds, 1, 7), new ItemStack(ModItems.grassSeeds), new ItemStack(ModItems.manaResource, 1, 10));
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.grassSeeds, 1, 8), new ItemStack(ModItems.grassSeeds), new ItemStack(Items.spider_eye));
recipesAltGrassSeeds = BotaniaAPI.getLatestAddedRecipes(6);
///////////////////////////////////////////////////////////////////////////////////////////////////////////
// Storage Block/Nugget Recipes
@@ -134,9 +134,10 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi
public static boolean spawn(EntityPlayer player, ItemStack par1ItemStack, World par3World, BlockPos pos, boolean hard) {
Block block = par3World.getBlock(par4, par5, par6);
if(block == Blocks.beacon && isTruePlayer(player) && !par3World.isRemote) {
if(block == Blocks.beacon && isTruePlayer(player)) {
if(par3World.getDifficulty() == EnumDifficulty.PEACEFUL) {
player.addChatMessage(new ChatComponentTranslation("botaniamisc.peacefulNoob").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED)));
if(!par3World.isRemote)
player.addChatMessage(new ChatComponentTranslation("botaniamisc.peacefulNoob").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED)));
return false;
}
@@ -148,13 +149,30 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi
Block blockat = par3World.getBlock(x, y, z);
int meta = par3World.getBlockMetadata(x, y, z);
if(blockat != ModBlocks.pylon || meta != 2) {
player.addChatMessage(new ChatComponentTranslation("botaniamisc.needsCatalysts").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED)));
if(!par3World.isRemote)
player.addChatMessage(new ChatComponentTranslation("botaniamisc.needsCatalysts").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED)));
return false;
}
}
if(!hasProperArena(par3World, par4, par5, par6)) {
player.addChatMessage(new ChatComponentTranslation("botaniamisc.badArena").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED)));
for(int i = 0; i < 360; i += 8) {
float r = 1F;
float g = 0F;
float b = 1F;
float m = 0.15F;
float mv = 0.35F;
float rad = i * (float) Math.PI / 180F;
double x = par4 + 0.5 - Math.cos(rad) * RANGE;
double y = par5 + 0.5;
double z = par6 + 0.5 - Math.sin(rad) * RANGE;
Botania.proxy.sparkleFX(par3World, x, y, z, r, g, b, 5F, 120);
}
if(!par3World.isRemote)
player.addChatMessage(new ChatComponentTranslation("botaniamisc.badArena").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED)));
return false;
}
@@ -31,6 +31,7 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.decor.IFloatingFlower.IslandType;
import vazkii.botania.common.lib.LibItemNames;
import net.minecraftforge.fml.common.FMLCommonHandler;
@@ -45,10 +46,11 @@ public class ItemGrassSeeds extends ItemMod {
private static Map<Integer, List<BlockSwapper>> blockSwappers = new HashMap();
private static final IslandType[] ISLAND_TYPES = {
IslandType.GRASS, IslandType.PODZOL, IslandType.MYCEL
IslandType.GRASS, IslandType.PODZOL, IslandType.MYCEL,
null, null, null, null, null, null
};
private static final int types = 3;
private static final int SUBTYPES = 9;
IIcon[] icons;
public ItemGrassSeeds() {
@@ -60,15 +62,15 @@ public class ItemGrassSeeds extends ItemMod {
@Override
public void getSubItems(Item par1, CreativeTabs par2, List par3) {
for(int i = 0; i < types; i++)
for(int i = 0; i < SUBTYPES; i++)
par3.add(new ItemStack(par1, 1, i));
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister) {
icons = new IIcon[types];
for(int i = 0; i < types; i++)
icons = new IIcon[SUBTYPES];
for(int i = 0; i < SUBTYPES; i++)
icons[i] = IconHelper.forItem(par1IconRegister, this, i);
}
@@ -87,7 +89,7 @@ public class ItemGrassSeeds extends ItemMod {
public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) {
IBlockState state = par3World.getBlockState(pos);
if(state == Blocks.dirt.getDefaultState()) {
if((state.getBlock() == Blocks.dirt || (state.getBlock() == Blocks.grass && par1ItemStack.getItemDamage() != 0)) && bmeta == 0) {
int meta = par1ItemStack.getItemDamage();
BlockSwapper swapper = addBlockSwapper(par3World, pos, meta);
@@ -100,14 +102,55 @@ public class ItemGrassSeeds extends ItemMod {
float r = 0F;
float g = 0.4F;
float b = 0F;
if(meta == 1) {
switch(meta) {
case 1: {
r = 0.5F;
g = 0.37F;
b = 0F;
} else if(meta == 2) {
break;
}
case 2: {
r = 0.27F;
g = 0F;
b = 0.33F;
break;
}
case 3: {
r = 0.4F;
g = 0.5F;
b = 0.05F;
break;
}
case 4: {
r = 0.75F;
g = 0.7F;
b = 0F;
break;
}
case 5: {
r = 0F;
g = 0.5F;
b = 0.1F;
break;
}
case 6: {
r = 0.75F;
g = 0F;
b = 0F;
break;
}
case 7: {
r = 0F;
g = 0.55F;
b = 0.55F;
break;
}
case 8: {
r = 0.4F;
g = 0.1F;
b = 0.4F;
break;
}
}
float velMul = 0.025F;
@@ -150,6 +193,12 @@ public class ItemGrassSeeds extends ItemMod {
switch(meta) {
case 1 : return new BlockSwapper(world, pos, Blocks.dirt.getDefaultState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.PODZOL));
case 2 : return new BlockSwapper(world, pos, Blocks.mycelium.getDefaultState());
case 3 : return new BlockSwapper(world, pos, ModBlocks.altGrass, 0);
case 4 : return new BlockSwapper(world, pos, ModBlocks.altGrass, 1);
case 5 : return new BlockSwapper(world, pos, ModBlocks.altGrass, 2);
case 6 : return new BlockSwapper(world, pos, ModBlocks.altGrass, 3);
case 7 : return new BlockSwapper(world, pos, ModBlocks.altGrass, 4);
case 8 : return new BlockSwapper(world, pos, ModBlocks.altGrass, 5);
default : return new BlockSwapper(world, pos, Blocks.grass.getDefaultState());
}
}
@@ -186,8 +235,9 @@ public class ItemGrassSeeds extends ItemMod {
for(int l = -1; l < 2; l++) {
BlockPos pos1 = pos.add(k, 0, l);
IBlockState state1 = world.getBlockState(pos1);
if(state1.getBlock() == Blocks.dirt
if((state1.getBlock() == Blocks.dirt
&& state1.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT)
|| state1.getBlock() == Blocks.grass)
validCoords.add(pos1);
}
@@ -454,7 +454,7 @@ public final class LexiconData {
dreadthorne.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.dreadthorneRecipe));
heiseiDream = new ALexiconEntry(LibLexicon.FFLOWER_HEISEI_DREAM, categoryFunctionalFlowers);
heiseiDream.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.heiseiDreamRecipe), new PageText("2"));
heiseiDream.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.heiseiDreamRecipe));
tigerseye = new BLexiconEntry(LibLexicon.FFLOWER_TIGERSEYE, categoryFunctionalFlowers);
tigerseye.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.tigerseyeRecipe));
@@ -469,7 +469,7 @@ public final class LexiconData {
if(ConfigHandler.fallenKanadeEnabled) {
fallenKanade = new BLexiconEntry(LibLexicon.FFLOWER_FALLEN_KANADE, categoryFunctionalFlowers);
fallenKanade.setLexiconPages(new PageText(Botania.bloodMagicLoaded ? "0a" : "0"), new PagePetalRecipe("1", ModPetalRecipes.fallenKanadeRecipe), new PageText("2"));
fallenKanade.setLexiconPages(new PageText(Botania.bloodMagicLoaded ? "0a" : "0"), new PagePetalRecipe("1", ModPetalRecipes.fallenKanadeRecipe));
}
exoflame = new BLexiconEntry(LibLexicon.FFLOWER_EXOFLAME, categoryFunctionalFlowers);
@@ -535,7 +535,7 @@ public final class LexiconData {
primusLoci.setIcon(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DAYBLOOM_PRIME));
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"));
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));
nightshade = new BLexiconEntry(LibLexicon.GFLOWER_NIGHTSHADE, categoryGenerationFlowers);
nightshade.setLexiconPages(new PageText(ConfigHandler.hardcorePassiveGeneration > 0 ? "0a" :"0"), new PagePetalRecipe("1", ModPetalRecipes.nightshadeRecipe));
@@ -562,7 +562,7 @@ public final class LexiconData {
kekimurus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.kekimurusRecipe));
gourmaryllis = new BLexiconEntry(LibLexicon.GFLOWER_GOURMARYLLIS, categoryGenerationFlowers);
gourmaryllis.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PagePetalRecipe("3", ModPetalRecipes.gourmaryllisRecipe), new PageText("4"), new PageText("5"), new PageText("6"));
gourmaryllis.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PagePetalRecipe("3", ModPetalRecipes.gourmaryllisRecipe));
narslimmus = new BLexiconEntry(LibLexicon.GFLOWER_NARSLIMMUS, categoryGenerationFlowers);
narslimmus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.narslimmusRecipe));
@@ -672,7 +672,7 @@ public final class LexiconData {
manaBlaster.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeManaBlaster));
grassSeeds = new BLexiconEntry(LibLexicon.TOOL_GRASS_SEEDS, categoryTools);
grassSeeds.setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", ModManaInfusionRecipes.grassSeedsRecipe), new PageManaInfusionRecipe("2", ModManaInfusionRecipes.podzolSeedsRecipe), new PageManaInfusionRecipe("3", ModManaInfusionRecipes.mycelSeedsRecipes));
grassSeeds.setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", ModManaInfusionRecipes.grassSeedsRecipe), new PageManaInfusionRecipe("2", ModManaInfusionRecipes.podzolSeedsRecipe), new PageManaInfusionRecipe("3", ModManaInfusionRecipes.mycelSeedsRecipes), new PageText("4"), new PageCraftingRecipe("5", ModCraftingRecipes.recipesAltGrassSeeds));
dirtRod = new BLexiconEntry(LibLexicon.TOOL_DIRT_ROD, categoryTools);
dirtRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeDirtRod));
@@ -108,6 +108,9 @@ public class PageCraftingRecipe extends PageRecipe {
@Override
@SideOnly(Side.CLIENT)
public void updateScreen() {
if(GuiScreen.isShiftKeyDown())
return;
if(ticksElapsed % 20 == 0) {
recipeAt++;
@@ -100,6 +100,9 @@ public class PageElvenRecipe extends PageRecipe {
@Override
@SideOnly(Side.CLIENT)
public void updateScreen() {
if(GuiScreen.isShiftKeyDown())
return;
if(ticksElapsed % 20 == 0) {
recipeAt++;
@@ -139,6 +139,9 @@ public class PageManaInfusionRecipe extends PageRecipe {
@Override
@SideOnly(Side.CLIENT)
public void updateScreen() {
if(GuiScreen.isShiftKeyDown())
return;
if(ticksElapsed % 20 == 0) {
recipeAt++;
@@ -68,7 +68,7 @@ public class PagePetalRecipe<T extends RecipePetals> extends PageRecipe {
List<Object> inputs = recipe.getInputs();
int degreePerInput = (int) (360F / inputs.size());
float currentDegree = ConfigHandler.lexiconRotatingItems ? (float) (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) : 0;
float currentDegree = ConfigHandler.lexiconRotatingItems ? (GuiScreen.isShiftKeyDown() ? ticksElapsed : (float) (ticksElapsed + ClientTickHandler.partialTicks)) : 0;
for(Object obj : inputs) {
Object input = obj;
@@ -95,8 +95,6 @@ public class PagePetalRecipe<T extends RecipePetals> extends PageRecipe {
return new ItemStack(ModBlocks.altar);
}
@SideOnly(Side.CLIENT)
public void renderManaBar(IGuiLexiconEntry gui, T recipe, int mx, int my) {
// NO-OP
@@ -105,6 +103,9 @@ public class PagePetalRecipe<T extends RecipePetals> extends PageRecipe {
@Override
@SideOnly(Side.CLIENT)
public void updateScreen() {
if(GuiScreen.isShiftKeyDown())
return;
if(ticksElapsed % 20 == 0) {
recipeAt++;
@@ -105,6 +105,7 @@ public final class LibBlockNames {
public static final String SHIMMERROCK = "shimmerrock";
public static final String SHIMMERWOOD_PLANKS = "shimmerwoodPlanks";
public static final String AVATAR = "avatar";
public static final String ALT_GRASS = "altGrass";
public static final String SUBTILE_PUREDAISY = "puredaisy";
public static final String SUBTILE_MANASTAR = "manastar";