mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-22 05:02:25 +00:00
WIP Weather obelisk first pass
This commit is contained in:
1 parent
e17c938814
commit
045a04cc76
20 files changed
+395
-39
No files matched your search
@@ -8,6 +8,7 @@ import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.potion.Potion;
|
||||
@@ -115,6 +116,8 @@ import crazypants.enderio.machine.vacuum.BlockVacuumChest;
|
||||
import crazypants.enderio.machine.vacuum.VacuumChestRenderer;
|
||||
import crazypants.enderio.machine.vat.BlockVat;
|
||||
import crazypants.enderio.machine.vat.VatRenderer;
|
||||
import crazypants.enderio.machine.weather.BlockWeatherObelisk;
|
||||
import crazypants.enderio.machine.weather.TileWeatherObelisk;
|
||||
import crazypants.enderio.machine.xp.BlockExperienceObelisk;
|
||||
import crazypants.enderio.machine.xp.TileExperienceOblisk;
|
||||
import crazypants.enderio.material.BlockFusedQuartz;
|
||||
@@ -252,6 +255,11 @@ public class ClientProxy extends CommonProxy {
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileExperienceOblisk.class, eor);
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockExperianceOblisk), eor);
|
||||
|
||||
ObeliskRenderer<TileWeatherObelisk> twr = new ObeliskRenderer<TileWeatherObelisk>(new ItemStack(Items.diamond));
|
||||
BlockWeatherObelisk.renderId = BlockAttractor.renderId;
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileWeatherObelisk.class, twr);
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockWeatherObelisk), twr);
|
||||
|
||||
if(Config.useCombustionGenModel) {
|
||||
CombustionGeneratorModelRenderer cgmr = new CombustionGeneratorModelRenderer();
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileCombustionGenerator.class, cgmr);
|
||||
|
||||
@@ -126,6 +126,7 @@ import crazypants.enderio.machine.transceiver.ServerChannelRegister;
|
||||
import crazypants.enderio.machine.vacuum.BlockVacuumChest;
|
||||
import crazypants.enderio.machine.vat.BlockVat;
|
||||
import crazypants.enderio.machine.vat.VatRecipeManager;
|
||||
import crazypants.enderio.machine.weather.BlockWeatherObelisk;
|
||||
import crazypants.enderio.machine.wireless.BlockWirelessCharger;
|
||||
import crazypants.enderio.machine.xp.BlockExperienceObelisk;
|
||||
import crazypants.enderio.machine.xp.ItemXpTransfer;
|
||||
@@ -240,6 +241,7 @@ public class EnderIO {
|
||||
public static BlockAttractor blockAttractor;
|
||||
public static BlockSpawnGuard blockSpawnGuard;
|
||||
public static BlockExperienceObelisk blockExperianceOblisk;
|
||||
public static BlockWeatherObelisk blockWeatherObelisk;
|
||||
public static BlockTransceiver blockTransceiver;
|
||||
public static BlockBuffer blockBuffer;
|
||||
|
||||
@@ -353,6 +355,7 @@ public class EnderIO {
|
||||
blockAttractor = BlockAttractor.create();
|
||||
blockSpawnGuard = BlockSpawnGuard.create();
|
||||
blockExperianceOblisk = BlockExperienceObelisk.create();
|
||||
blockWeatherObelisk = BlockWeatherObelisk.create();
|
||||
blockEnchanter = BlockEnchanter.create();
|
||||
|
||||
blockDarkSteelPressurePlate = BlockDarkSteelPressurePlate.create();
|
||||
|
||||
@@ -51,6 +51,7 @@ public class GuiHandler implements IGuiHandler {
|
||||
public static final int GUI_ID_XP_OBELISK = 98;
|
||||
public static final int GUI_ID_ANVIL = 99;
|
||||
public static final int GUI_ID_BUFFER = 100;
|
||||
public static final int GUI_ID_WEATHER_OBELISK = 101;
|
||||
|
||||
public static final int GUI_ID_CAP_BANK = 142; // leave room for more machines
|
||||
|
||||
|
||||
@@ -58,6 +58,7 @@ public enum ModObject {
|
||||
blockAttractor,
|
||||
blockSpawnGuard,
|
||||
blockExperienceObelisk,
|
||||
blockWeatherObelisk,
|
||||
blockTransceiver,
|
||||
blockBuffer,
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ import crazypants.vecmath.VecmathUtil;
|
||||
public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity implements IInternalPoweredTile {
|
||||
|
||||
// Power
|
||||
protected Capacitors capacitorType;
|
||||
private Capacitors capacitorType;
|
||||
|
||||
private int storedEnergyRF;
|
||||
protected float lastSyncPowerStored = -1;
|
||||
@@ -81,6 +81,10 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity
|
||||
return storedEnergyRF > 0;
|
||||
}
|
||||
|
||||
public Capacitors getCapacitorType() {
|
||||
return capacitorType;
|
||||
}
|
||||
|
||||
public ICapacitor getCapacitor() {
|
||||
return capacitorType.capacitor;
|
||||
}
|
||||
|
||||
@@ -80,7 +80,7 @@ public class TileCrafter extends AbstractPowerConsumerEntity implements IItemBuf
|
||||
if(!redstoneCheckPassed || !craftingGrid.hasValidRecipe() || !canMergeOutput() || !hasRequiredPower()) {
|
||||
return false;
|
||||
}
|
||||
int ticksPerCraft = getTicksPerCraft(capacitorType);
|
||||
int ticksPerCraft = getTicksPerCraft(getCapacitorType());
|
||||
if(ticksSinceLastCraft <= ticksPerCraft) {
|
||||
return false;
|
||||
}
|
||||
@@ -118,7 +118,7 @@ public class TileCrafter extends AbstractPowerConsumerEntity implements IItemBuf
|
||||
|
||||
@Override
|
||||
public int getPowerUsePerTick() {
|
||||
return getPowerUsePerTick(capacitorType);
|
||||
return getPowerUsePerTick(getCapacitorType());
|
||||
}
|
||||
|
||||
public int getPowerUsePerTick(Capacitors type) {
|
||||
|
||||
@@ -483,7 +483,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
|
||||
if(curStack == null) {
|
||||
inventory[i] = stack.copy();
|
||||
inserted = stack.stackSize;
|
||||
} else if(curStack.isItemEqual(stack) && ItemStack.areItemStackTagsEqual(curStack,stack)) {
|
||||
} else if(curStack.isItemEqual(stack)) {
|
||||
inserted = Math.min(16 - curStack.stackSize, stack.stackSize);
|
||||
inventory[i].stackSize += inserted;
|
||||
}
|
||||
@@ -498,14 +498,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
|
||||
ResultStack[] in = new ResultStack[] { new ResultStack(stack) };
|
||||
mergeResults(in);
|
||||
return origSize - (in[0].item == null ? 0 : in[0].item.stackSize);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getNumCanMerge(ItemStack itemStack, ItemStack result) {
|
||||
if(!itemStack.isItemEqual(result) || !ItemStack.areItemStackTagsEqual(itemStack,result)) {
|
||||
return 0;
|
||||
}
|
||||
return Math.min(itemStack.getMaxStackSize() - itemStack.stackSize, result.stackSize);
|
||||
}
|
||||
|
||||
private BlockCoord getNextCoord() {
|
||||
@@ -568,7 +561,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
|
||||
|
||||
@Override
|
||||
public void setCapacitor(Capacitors capacitorType) {
|
||||
this.capacitorType = capacitorType;
|
||||
super.setCapacitor(capacitorType);
|
||||
tier = capacitorType.ordinal();
|
||||
currentTask = createTask();
|
||||
|
||||
@@ -586,8 +579,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity {
|
||||
}
|
||||
if(getEnergyStored() > getMaxEnergyStored()) {
|
||||
setEnergyStored(getMaxEnergyStored());
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+1
-4
@@ -170,7 +170,7 @@ public class TileCombustionGenerator extends AbstractGeneratorEntity implements
|
||||
generatedDirty = true;
|
||||
}
|
||||
|
||||
if(getEnergyStored() >= capacitorType.capacitor.getMaxEnergyStored()) {
|
||||
if(getEnergyStored() >= getCapacitor().getMaxEnergyStored()) {
|
||||
inPause = true;
|
||||
}
|
||||
|
||||
@@ -222,7 +222,6 @@ public class TileCombustionGenerator extends AbstractGeneratorEntity implements
|
||||
}
|
||||
inPause = false;
|
||||
|
||||
boolean res = false;
|
||||
ticksRemaingFuel--;
|
||||
if(ticksRemaingFuel <= 0) {
|
||||
curFuel = FluidFuelRegister.instance.getFuel(getFuelTank().getFluid());
|
||||
@@ -235,7 +234,6 @@ public class TileCombustionGenerator extends AbstractGeneratorEntity implements
|
||||
}
|
||||
ticksRemaingFuel = getNumTicksPerMbFuel(curFuel) * drained.amount;
|
||||
|
||||
res = true;
|
||||
tanksDirty = true;
|
||||
} else if(curFuel == null) {
|
||||
curFuel = FluidFuelRegister.instance.getFuel(getFuelTank().getFluid());
|
||||
@@ -255,7 +253,6 @@ public class TileCombustionGenerator extends AbstractGeneratorEntity implements
|
||||
return false;
|
||||
}
|
||||
ticksRemaingCoolant = getNumTicksPerMbCoolant(curCoolant, curFuel) * drained.amount;
|
||||
res = true;
|
||||
} else if(curCoolant == null) {
|
||||
updateCoolantFromTank();
|
||||
if(curCoolant == null) {
|
||||
|
||||
+4
-4
@@ -148,18 +148,18 @@ public class TileEntityStirlingGenerator extends AbstractGeneratorEntity impleme
|
||||
}
|
||||
|
||||
private float getEnergyMultiplier() {
|
||||
if(capacitorType == Capacitors.ACTIVATED_CAPACITOR) {
|
||||
if(getCapacitorType() == Capacitors.ACTIVATED_CAPACITOR) {
|
||||
return 2;
|
||||
} else if(capacitorType == Capacitors.ENDER_CAPACITOR) {
|
||||
} else if(getCapacitorType() == Capacitors.ENDER_CAPACITOR) {
|
||||
return 4;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
public float getBurnTimeMultiplier() {
|
||||
if(capacitorType == Capacitors.ACTIVATED_CAPACITOR) {
|
||||
if(getCapacitorType() == Capacitors.ACTIVATED_CAPACITOR) {
|
||||
return 1.5f;
|
||||
} else if(capacitorType == Capacitors.ENDER_CAPACITOR) {
|
||||
} else if(getCapacitorType() == Capacitors.ENDER_CAPACITOR) {
|
||||
return 1.5f;
|
||||
}
|
||||
return 2;
|
||||
|
||||
@@ -129,7 +129,7 @@ public class TileZombieGenerator extends AbstractGeneratorEntity implements IFlu
|
||||
res = true;
|
||||
}
|
||||
|
||||
if(getEnergyStored() >= capacitorType.capacitor.getMaxEnergyStored()) {
|
||||
if(getEnergyStored() >= getCapacitor().getMaxEnergyStored()) {
|
||||
inPause = true;
|
||||
}
|
||||
|
||||
@@ -146,8 +146,6 @@ public class TileZombieGenerator extends AbstractGeneratorEntity implements IFlu
|
||||
|
||||
private boolean generateEnergy() {
|
||||
|
||||
int generated = 0;
|
||||
|
||||
//once full, don't start again until we have drained 10 seconds worth of power to prevent
|
||||
//flickering on and off constantly when powering a machine that draws less than this produces
|
||||
if(inPause && getEnergyStored() >= (getMaxEnergyStored() - (outputPerTick * 200))) {
|
||||
|
||||
@@ -1,19 +1,16 @@
|
||||
package crazypants.enderio.machine.gui;
|
||||
|
||||
import java.awt.Point;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import crazypants.enderio.machine.AbstractMachineEntity;
|
||||
import crazypants.enderio.machine.SlotDefinition;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
import net.minecraft.inventory.Container;
|
||||
import net.minecraft.inventory.Slot;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import crazypants.enderio.machine.AbstractMachineEntity;
|
||||
import crazypants.enderio.machine.SlotDefinition;
|
||||
|
||||
public abstract class AbstractMachineContainer extends Container {
|
||||
|
||||
|
||||
@@ -86,9 +86,9 @@ public class TileSliceAndSplice extends AbstractPoweredTaskEntity {
|
||||
|
||||
@Override
|
||||
public int getPowerUsePerTick() {
|
||||
if(capacitorType.ordinal() == 0) {
|
||||
if(getCapacitorType().ordinal() == 0) {
|
||||
return POWER_PER_TICK_ONE;
|
||||
} else if(capacitorType.ordinal() == 1) {
|
||||
} else if(getCapacitorType().ordinal() == 1) {
|
||||
return POWER_PER_TICK_TWO;
|
||||
}
|
||||
return POWER_PER_TICK_THREE;
|
||||
|
||||
@@ -166,9 +166,9 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveEx
|
||||
|
||||
@Override
|
||||
public int getPowerUsePerTick() {
|
||||
if(capacitorType.ordinal() == 0) {
|
||||
if(getCapacitorType().ordinal() == 0) {
|
||||
return POWER_PER_TICK_ONE;
|
||||
} else if(capacitorType.ordinal() == 1) {
|
||||
} else if(getCapacitorType().ordinal() == 1) {
|
||||
return POWER_PER_TICK_TWO;
|
||||
}
|
||||
return POWER_PER_TICK_THREE;
|
||||
|
||||
@@ -85,7 +85,7 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity {
|
||||
|
||||
@Override
|
||||
public void setCapacitor(Capacitors capacitorType) {
|
||||
this.capacitorType = capacitorType;
|
||||
super.setCapacitor(capacitorType);
|
||||
ICapacitor refCap;
|
||||
switch (capacitorType) {
|
||||
case BASIC_CAPACITOR:
|
||||
@@ -150,9 +150,9 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity {
|
||||
@Override
|
||||
public int getPowerUsePerTick() {
|
||||
double multuplier = PoweredSpawnerConfig.getInstance().getCostMultiplierFor(logic.getEntityNameToSpawn());
|
||||
if(capacitorType.ordinal() == 0) {
|
||||
if(getCapacitorType().ordinal() == 0) {
|
||||
return (int) Math.round(POWER_PER_TICK_ONE * multuplier);
|
||||
} else if(capacitorType.ordinal() == 1) {
|
||||
} else if(getCapacitorType().ordinal() == 1) {
|
||||
return (int) Math.round(POWER_PER_TICK_TWO * multuplier);
|
||||
}
|
||||
return (int) Math.round(POWER_PER_TICK_THREE * multuplier);
|
||||
@@ -237,9 +237,9 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity {
|
||||
} else {
|
||||
ticksDelay = TilePoweredSpawner.MAX_SPAWN_DELAY_BASE - ((TilePoweredSpawner.MAX_SPAWN_DELAY_BASE - TilePoweredSpawner.MIN_SPAWN_DELAY_BASE) / 2);
|
||||
}
|
||||
if(capacitorType.ordinal() == 1) {
|
||||
if(getCapacitorType().ordinal() == 1) {
|
||||
ticksDelay /= 2;
|
||||
} else if(capacitorType.ordinal() == 2) {
|
||||
} else if(getCapacitorType().ordinal() == 2) {
|
||||
ticksDelay /= 4;
|
||||
}
|
||||
int powerPerTick = getPowerUsePerTick();
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
package crazypants.enderio.machine.weather;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.world.World;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import crazypants.enderio.GuiHandler;
|
||||
import crazypants.enderio.ModObject;
|
||||
import crazypants.enderio.machine.AbstractMachineBlock;
|
||||
import crazypants.enderio.network.PacketHandler;
|
||||
|
||||
public class BlockWeatherObelisk extends AbstractMachineBlock<TileWeatherObelisk> {
|
||||
|
||||
public static int renderId;
|
||||
|
||||
public static BlockWeatherObelisk create() {
|
||||
BlockWeatherObelisk ret = new BlockWeatherObelisk();
|
||||
ret.init();
|
||||
PacketHandler.INSTANCE.registerMessage(PacketActivateWeather.class, PacketActivateWeather.class, PacketHandler.nextID(), Side.SERVER);
|
||||
PacketHandler.INSTANCE.registerMessage(PacketFinishWeather.Handler.class, PacketFinishWeather.class, PacketHandler.nextID(), Side.CLIENT);
|
||||
return ret;
|
||||
}
|
||||
|
||||
private BlockWeatherObelisk() {
|
||||
super(ModObject.blockWeatherObelisk, TileWeatherObelisk.class);
|
||||
setObeliskBounds();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
|
||||
return new ContainerWeatherObelisk(player.inventory, (TileWeatherObelisk) world.getTileEntity(x, y, z));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
|
||||
return new GuiWeatherObelisk(player.inventory, (TileWeatherObelisk) world.getTileEntity(x, y, z));
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean renderAsNormalBlock() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isOpaqueCube() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getLightOpacity() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRenderType() {
|
||||
return renderId;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getGuiId() {
|
||||
return GuiHandler.GUI_ID_WEATHER_OBELISK;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getMachineFrontIconKey(boolean active) {
|
||||
return "enderio:blockWeatherObeliskSide";
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
package crazypants.enderio.machine.weather;
|
||||
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
import net.minecraft.inventory.Slot;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import crazypants.enderio.machine.gui.AbstractMachineContainer;
|
||||
|
||||
public class ContainerWeatherObelisk extends AbstractMachineContainer {
|
||||
|
||||
public ContainerWeatherObelisk(InventoryPlayer playerInv, TileWeatherObelisk te) {
|
||||
super(playerInv, te);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void addMachineSlots(InventoryPlayer playerInv) {
|
||||
addSlotToContainer(new Slot(tileEntity, 0, 130, 80) {
|
||||
@Override
|
||||
public boolean isItemValid(ItemStack itemStack) {
|
||||
return tileEntity.isItemValidForSlot(0, itemStack);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
package crazypants.enderio.machine.weather;
|
||||
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
import crazypants.enderio.gui.IconButtonEIO;
|
||||
import crazypants.enderio.gui.IconEIO;
|
||||
import crazypants.enderio.machine.gui.GuiPoweredMachineBase;
|
||||
import crazypants.enderio.machine.weather.TileWeatherObelisk.Task;
|
||||
import crazypants.enderio.network.PacketHandler;
|
||||
|
||||
public class GuiWeatherObelisk extends GuiPoweredMachineBase<TileWeatherObelisk> {
|
||||
|
||||
public GuiWeatherObelisk(InventoryPlayer inventory, TileWeatherObelisk tileEntity) {
|
||||
super(tileEntity, new ContainerWeatherObelisk(inventory, tileEntity));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initGui() {
|
||||
super.initGui();
|
||||
addButton(new IconButtonEIO(this, 0, 100, 50, IconEIO.SINGLE_PLUS));
|
||||
addButton(new IconButtonEIO(this, 1, 130, 50, IconEIO.DOUBLE_PLUS));
|
||||
addButton(new IconButtonEIO(this, 2, 160, 50, IconEIO.TRIPLE_PLUS));
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void actionPerformed(GuiButton b) {
|
||||
super.actionPerformed(b);
|
||||
if (b.id >= 0 && b.id <= 2) {
|
||||
PacketHandler.INSTANCE.sendToServer(new PacketActivateWeather(getTileEntity(), Task.values()[b.id]));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
package crazypants.enderio.machine.weather;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessage;
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
|
||||
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
|
||||
import crazypants.enderio.network.MessageTileEntity;
|
||||
|
||||
public class PacketActivateWeather extends MessageTileEntity<TileWeatherObelisk> implements IMessageHandler<PacketActivateWeather, IMessage> {
|
||||
|
||||
public PacketActivateWeather() {
|
||||
}
|
||||
|
||||
int taskid;
|
||||
|
||||
public PacketActivateWeather(TileWeatherObelisk te, TileWeatherObelisk.Task task) {
|
||||
super(te);
|
||||
this.taskid = task.ordinal();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void toBytes(ByteBuf buf) {
|
||||
super.toBytes(buf);
|
||||
buf.writeInt(taskid);
|
||||
}
|
||||
|
||||
public void fromBytes(ByteBuf buf) {
|
||||
super.fromBytes(buf);
|
||||
taskid = buf.readInt();
|
||||
}
|
||||
|
||||
@Override
|
||||
public IMessage onMessage(PacketActivateWeather message, MessageContext ctx) {
|
||||
TileWeatherObelisk te = message.getTileEntity(message.getWorld(ctx));
|
||||
if (te != null) {
|
||||
te.startTask(message.taskid);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
package crazypants.enderio.machine.weather;
|
||||
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessage;
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
|
||||
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.machine.weather.TileWeatherObelisk.Task;
|
||||
|
||||
public class PacketFinishWeather extends PacketActivateWeather {
|
||||
|
||||
public PacketFinishWeather() {}
|
||||
|
||||
public PacketFinishWeather(TileWeatherObelisk te, Task task) {
|
||||
super(te, task);
|
||||
}
|
||||
|
||||
public static class Handler implements IMessageHandler<PacketFinishWeather, IMessage> {
|
||||
|
||||
@Override
|
||||
public IMessage onMessage(PacketFinishWeather message, MessageContext ctx) {
|
||||
TileWeatherObelisk te = message.getTileEntity(EnderIO.proxy.getClientWorld());
|
||||
if (te != null) {
|
||||
te.activateClientParticles();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,163 @@
|
||||
package crazypants.enderio.machine.weather;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.particle.EntitySmokeFX;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import crazypants.enderio.ModObject;
|
||||
import crazypants.enderio.machine.AbstractPowerConsumerEntity;
|
||||
import crazypants.enderio.machine.SlotDefinition;
|
||||
import crazypants.enderio.network.PacketHandler;
|
||||
|
||||
public class TileWeatherObelisk extends AbstractPowerConsumerEntity {
|
||||
|
||||
enum Task {
|
||||
// TODO placeholder power vals
|
||||
CLEAR(1000, new ItemStack(Items.cake)) {
|
||||
@Override
|
||||
void complete(TileEntity te) {
|
||||
rain(te, false);
|
||||
thunder(te, false);
|
||||
}
|
||||
},
|
||||
RAIN(1000, new ItemStack(Items.water_bucket)) {
|
||||
@Override
|
||||
void complete(TileEntity te) {
|
||||
rain(te, true);
|
||||
thunder(te, false);
|
||||
}
|
||||
},
|
||||
STORM(1000, new ItemStack(Items.lava_bucket)) {
|
||||
@Override
|
||||
void complete(TileEntity te) {
|
||||
rain(te, true);
|
||||
thunder(te, true);
|
||||
}
|
||||
};
|
||||
|
||||
final int power;
|
||||
final ItemStack requiredItem;
|
||||
|
||||
Task(int power, ItemStack requiredItem) {
|
||||
this.power = power;
|
||||
this.requiredItem = requiredItem;
|
||||
}
|
||||
|
||||
abstract void complete(TileEntity te);
|
||||
|
||||
void rain(TileEntity te, boolean state) {
|
||||
te.getWorldObj().getWorldInfo().setRaining(state);
|
||||
}
|
||||
|
||||
void thunder(TileEntity te, boolean state) {
|
||||
te.getWorldObj().getWorldInfo().setThundering(false);
|
||||
}
|
||||
|
||||
boolean isValid(ItemStack item) {
|
||||
return item != null && ItemStack.areItemStacksEqual(item, this.requiredItem);
|
||||
}
|
||||
}
|
||||
|
||||
private int powerUsed = 0;
|
||||
private Task activeTask = null;
|
||||
|
||||
private boolean canBeActive = true;
|
||||
|
||||
public TileWeatherObelisk() {
|
||||
super(new SlotDefinition(1, 0, 1));
|
||||
}
|
||||
|
||||
public void updateEntity() {
|
||||
super.updateEntity();
|
||||
if (worldObj.isRemote) {
|
||||
if (activeParticleTicks > 0) {
|
||||
spawnParticle();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private void spawnParticle() {
|
||||
EntitySmokeFX fx = new EntitySmokeFX(getWorldObj(), xCoord + 0.5, yCoord + 0.3, zCoord + 0.5, 0, 0.2, 0);
|
||||
fx.setRBGColorF(0.95f, 0.50f, 1f);
|
||||
Minecraft.getMinecraft().effectRenderer.addEffect(fx);
|
||||
activeParticleTicks--;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMachineName() {
|
||||
return ModObject.blockWeatherObelisk.unlocalisedName;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) {
|
||||
for (Task task : Task.values()) {
|
||||
if (task.isValid(itemstack)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isActive() {
|
||||
return canBeActive && activeTask != null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getProgress() {
|
||||
return isActive() ? (float) powerUsed / (float) activeTask.power : 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean processTasks(boolean redstoneCheckPassed) {
|
||||
boolean res = false;
|
||||
|
||||
if(!redstoneCheckPassed) {
|
||||
if(canBeActive) {
|
||||
canBeActive = false;
|
||||
res = true;
|
||||
}
|
||||
return res;
|
||||
} else {
|
||||
canBeActive = true;
|
||||
|
||||
if(isActive()) {
|
||||
if(getEnergyStored() > getPowerUsePerTick()) {
|
||||
int remaining = activeTask.power - powerUsed;
|
||||
int toUse = Math.min(remaining, getPowerUsePerTick());
|
||||
setEnergyStored(getEnergyStored() - toUse);
|
||||
powerUsed += toUse;
|
||||
res = true;
|
||||
}
|
||||
|
||||
if(powerUsed >= activeTask.power) {
|
||||
activeTask.complete(this);
|
||||
PacketHandler.INSTANCE.sendToDimension(new PacketFinishWeather(this, activeTask), worldObj.provider.dimensionId);
|
||||
powerUsed = 0;
|
||||
activeTask = null;
|
||||
res = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public void startTask(int taskid) {
|
||||
powerUsed = 0;
|
||||
Task task = Task.values()[taskid];
|
||||
if (task.isValid(inventory[slotDefinition.minInputSlot])) {
|
||||
activeTask = task;
|
||||
decrStackSize(slotDefinition.minInputSlot, 1);
|
||||
}
|
||||
}
|
||||
|
||||
private int activeParticleTicks = 0;
|
||||
public void activateClientParticles() {
|
||||
activeParticleTicks = 10;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user