Starting the power system transfer!

This commit is contained in:
Vasco Lavos committed 2014-01-25 23:13:24 +00:00
1 parent 50c4f32a8a
commit cda8e88160
8 files changed
+209 -13

No files matched your search

@@ -66,7 +66,6 @@ public class SubTileEntity {
@SideOnly(Side.CLIENT)
public Icon getIcon() {
Icon icon = BotaniaAPI.internalHandler.getSubTileIconForName(getUnlocalizedName());
System.out.println(icon);
return icon;
}
@@ -11,6 +11,8 @@
*/
package vazkii.botania.common;
import vazkii.botania.api.internal.ManaNetworkEvent;
import vazkii.botania.common.core.handler.ManaNetworkHandler;
import vazkii.botania.common.core.proxy.CommonProxy;
import vazkii.botania.common.lib.LibMisc;
import cpw.mods.fml.common.Mod;
@@ -20,6 +22,7 @@ import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerStoppingEvent;
import cpw.mods.fml.common.network.NetworkMod;
@Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION)
@@ -46,4 +49,9 @@ public class Botania {
public void postInit(FMLPostInitializationEvent event) {
proxy.postInit(event);
}
@EventHandler
public void serverStopping(FMLServerStoppingEvent event) {
ManaNetworkHandler.instance.clear();
}
}
@@ -11,20 +11,22 @@
*/
package vazkii.botania.common.block;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import vazkii.botania.api.IWandable;
import vazkii.botania.client.core.handler.HUDHandler.IHUD;
import vazkii.botania.client.lib.LibRenderIDs;
import vazkii.botania.common.block.tile.TileSpreader;
import vazkii.botania.common.lib.LibBlockIDs;
import vazkii.botania.common.lib.LibBlockNames;
public class BlockSpreader extends BlockModContainer implements IWandable {
public class BlockSpreader extends BlockModContainer implements IWandable, IHUD {
protected BlockSpreader() {
super(LibBlockIDs.idSpreader, Material.wood);
@@ -55,7 +57,8 @@ public class BlockSpreader extends BlockModContainer implements IWandable {
@Override
public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) {
return false;
((TileSpreader) world.getBlockTileEntity(x, y, z)).onWanded(player, stack);
return true;
}
@Override
@@ -63,4 +66,9 @@ public class BlockSpreader extends BlockModContainer implements IWandable {
return new TileSpreader();
}
@Override
public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z) {
((TileSpreader) world.getBlockTileEntity(x, y, z)).renderHUD(mc, res);
}
}
@@ -18,38 +18,88 @@ import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChunkCoordinates;
import net.minecraft.util.StatCollector;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.mana.IManaCollector;
import vazkii.botania.api.subtile.SubTileEntity;
import vazkii.botania.common.Botania;
import vazkii.botania.common.core.handler.ManaNetworkHandler;
public class SubTileGenerating extends SubTileEntity {
private static final String TAG_MANA = "mana";
int mana;
int sizeLastCheck = -1;
TileEntity linkedCollector = null;
public int knownMana = -1;
@Override
public boolean canUpdate() {
return true;
}
@Override
public void onUpdate() {
super.onUpdate();
linkCollector();
int delay = getDelayBetweenPassiveGeneration();
if(delay > 0 && supertile.worldObj.getWorldTime() % delay == 0)
addMana(1);
emptyManaIntoCollector();
double particleChance = 1F - ((double) mana / (double) getMaxMana()) / 2F;
Color color = new Color(getColor());
if(Math.random() > particleChance)
Botania.proxy.sparkleFX(supertile.worldObj, supertile.xCoord + 0.3 + Math.random() * 0.5, supertile.yCoord + 0.5 + Math.random() * 0.5, supertile.zCoord + 0.3 + Math.random() * 0.5, (float) color.getRed() / 255F, (float) color.getGreen() / 255F, (float) color.getBlue() / 255F, (float) Math.random(), 5);
if(supertile.worldObj.isRemote) {
double particleChance = 1F - ((double) mana / (double) getMaxMana()) / 2F;
Color color = new Color(getColor());
if(Math.random() > particleChance)
Botania.proxy.sparkleFX(supertile.worldObj, supertile.xCoord + 0.3 + Math.random() * 0.5, supertile.yCoord + 0.5 + Math.random() * 0.5, supertile.zCoord + 0.3 + Math.random() * 0.5, (float) color.getRed() / 255F, (float) color.getGreen() / 255F, (float) color.getBlue() / 255F, (float) Math.random(), 5);
}
}
public void linkCollector() {
final int range = 12;
boolean needsNew = false;
if(linkedCollector == null)
needsNew = true;
if(!needsNew) {
TileEntity tileAt = supertile.worldObj.getBlockTileEntity(linkedCollector.xCoord, linkedCollector.yCoord, linkedCollector.zCoord);
if(!(tileAt instanceof IManaCollector)) {
linkedCollector = null;
needsNew = true;
} else linkedCollector = tileAt;
}
if(needsNew) {
int size = ManaNetworkHandler.instance.getAmount(ManaNetworkHandler.instance.manaCollectors, supertile.worldObj.provider.dimensionId);
if(size != sizeLastCheck) {
ChunkCoordinates coords = new ChunkCoordinates(supertile.xCoord, supertile.yCoord, supertile.zCoord);
linkedCollector = ManaNetworkHandler.instance.getClosestCollector(coords, supertile.worldObj.provider.dimensionId, range);
sizeLastCheck = size;
}
}
}
public void addMana(int mana) {
this.mana = Math.min(getMaxMana(), this.mana + mana);
}
public void emptyManaIntoCollector() {
if(linkedCollector != null) {
IManaCollector collector = (IManaCollector) linkedCollector;
if(!collector.isFull())
collector.recieveMana(mana);
mana = 0;
}
}
public int getDelayBetweenPassiveGeneration() {
return 30;
}
@@ -11,10 +11,84 @@
*/
package vazkii.botania.common.block.tile;
import net.minecraft.tileentity.TileEntity;
import vazkii.botania.api.IWandRotateable;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.packet.Packet132TileEntityData;
import net.minecraft.util.StatCollector;
public class TileSpreader extends TileEntity implements IWandRotateable {
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.IWandRotateable;
import vazkii.botania.api.internal.ManaNetworkEvent;
import vazkii.botania.api.mana.IManaCollector;
import vazkii.botania.common.block.ModBlocks;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.network.Player;
public class TileSpreader extends TileMod implements IWandRotateable, IManaCollector {
private static final int MAX_MANA = 1000;
private static final String TAG_MANA = "mana";
private static final String TAG_KNOWN_MANA = "knownMana";
int mana;
int knownMana = -1;
boolean added = false;
@Override
public boolean isFull() {
return mana >= MAX_MANA;
}
@Override
public void recieveMana(int mana) {
this.mana = Math.min(this.mana + mana, MAX_MANA);
}
@Override
public void invalidate() {
super.invalidate();
ManaNetworkEvent.removeCollector(this);
}
@Override
public void onChunkUnload() {
super.onChunkUnload();
ManaNetworkEvent.removeCollector(this);
}
@Override
public void updateEntity() {
if(!added) {
ManaNetworkEvent.addCollector(this);
added = true;
}
}
@Override
public void writeCustomNBT(NBTTagCompound cmp) {
cmp.setInteger(TAG_MANA, mana);
}
@Override
public void readCustomNBT(NBTTagCompound cmp) {
mana = cmp.getInteger(TAG_MANA);
if(cmp.hasKey(TAG_KNOWN_MANA))
knownMana = cmp.getInteger(TAG_KNOWN_MANA);
}
@Override
public boolean canRecieveManaFromBursts() {
return true;
}
@Override
public int getCurrentMana() {
return mana;
}
@Override
public int getHorizontalRotation() {
@@ -34,4 +108,42 @@ public class TileSpreader extends TileEntity implements IWandRotateable {
public void onClientTick() {
}
public void onWanded(EntityPlayer player, ItemStack wand) {
if(!player.isSneaking()) {
if(!worldObj.isRemote) {
NBTTagCompound nbttagcompound = new NBTTagCompound();
writeCustomNBT(nbttagcompound);
nbttagcompound.setInteger(TAG_KNOWN_MANA, mana);
PacketDispatcher.sendPacketToPlayer(new Packet132TileEntityData(xCoord, yCoord, zCoord, -999, nbttagcompound), (Player) player);
}
worldObj.playSoundAtEntity(player, "random.orb", 1F, 1F);
} else {
}
}
public void renderHUD(Minecraft mc, ScaledResolution res) {
String name = ModBlocks.spreader.getLocalizedName();
int type = 0;
if(mana >= 0) {
type = 1;
double percentage = (double) knownMana / (double) MAX_MANA * 100;
if(percentage == 100)
type = 5;
else if(percentage >= 75)
type = 4;
else if(percentage >= 50)
type = 3;
else if(percentage > 0)
type = 2;
}
String filling = StatCollector.translateToLocal("botaniamisc.status" + type);
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
int color = 0x66FFFFFF;
mc.fontRenderer.drawStringWithShadow(name, res.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(name) / 2, res.getScaledHeight() / 2 + 10, color);
mc.fontRenderer.drawStringWithShadow(filling, res.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(filling) / 2, res.getScaledHeight() / 2 + 20, color);
GL11.glDisable(GL11.GL_BLEND);
}
}
@@ -39,6 +39,11 @@ public final class ManaNetworkHandler {
else remove(map, event.tile);
}
public void clear() {
manaPools.clear();
manaCollectors.clear();
}
public TileEntity getClosestPool(ChunkCoordinates pos, int dimension, int limit) {
if(manaPools.containsKey(dimension))
return getClosest(manaPools.get(dimension), pos, limit);
@@ -91,4 +96,10 @@ public final class ManaNetworkHandler {
if(!tiles.contains(tile))
tiles.add(tile);
}
public int getAmount(Map<Integer, List<TileEntity>> map, int dim) {
if(!map.containsKey(dim))
return 0;
return map.get(dim).size();
}
}
@@ -51,7 +51,7 @@ public class CommonProxy {
NetworkRegistry.instance().registerGuiHandler(Botania.instance, new GuiHandler());
MinecraftForge.TERRAIN_GEN_BUS.register(new BiomeDecorationHandler());
MinecraftForge.EVENT_BUS.register(new ManaNetworkHandler());
MinecraftForge.EVENT_BUS.register(ManaNetworkHandler.instance);
}
public void postInit(FMLPostInitializationEvent event) {
@@ -49,6 +49,14 @@ public class ItemTwigWand extends Item16Colors {
return false;
}
@Override
public boolean shouldPassSneakingClickToBlock(World par2World, int par4, int par5, int par6) {
int id = par2World.getBlockId(par4, par5, par6);
if(Block.blocksList[id] instanceof IWandable)
return false;
return true;
}
@Override
public void registerIcons(IconRegister par1IconRegister) {
icons = new Icon[3];