+ Solar rework

+ update to Java 8
+ added GUI for Solars (in different colors)
+ changed Terra/Aer solar beeing dynamic (from y=5 to y=220|x1 to x3)
+ changed Ordo/Perditio solar generating at night/day (x0.75/x2)
+ changed Aqua solar generation (x1 at day, x2 under water, x3 while rain x6 while thunderstorm)
+ changed Ignis solar generation (x1 at day, x2 in Nether, x3 when fed with 10Ignis Centivis)
+ version number increase (1.2.7.0 -> 1.2.7.1)
This commit is contained in:
LOKKO12 committed 2018-03-02 17:33:19 +01:00
1 parent be6fc768f8
commit 2e2b2ef941
35 files changed
+1224 -142

No files matched your search

@@ -1,11 +1,14 @@
package emt.tile.solar.fire;
import cpw.mods.fml.common.FMLCommonHandler;
import emt.init.EMTBlocks;
import emt.tile.solar.TileEntitySolarBase;
import emt.util.EMTConfigHandler;
import ic2.api.energy.prefab.BasicSource;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.visnet.VisNetHandler;
public class TileEntityFireSolar extends TileEntitySolarBase {
@@ -13,28 +16,49 @@ public class TileEntityFireSolar extends TileEntitySolarBase {
super();
energySource = new BasicSource(this, 10000, 3);
output = EMTConfigHandler.compressedSolarOutput;
this.maxstorage=this.getEUCapacity();
}
@Override
public void checkConditions() {
if (!initialized && worldObj != null) {
canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0;
initialized = true;
boolean ignis = ((this.worldObj.provider.dimensionId == (-1)) || (theSunIsVisible));
if(ignis) {
this.isActive=true;
if (FMLCommonHandler.instance().getEffectiveSide().isServer()) {
this.generating=output*calc_multi();
this.energySource.addEnergy(this.output*calc_multi());
}
}
if (worldObj.provider.dimensionId == -1) {
energySource.addEnergy(output * 2);
}
else {
if (tick-- == 0) {
updateSunState();
tick = 64;
else this.isActive=false;
/*if (!ignis && VisNetHandler.drainVis(worldObj, xCoord, yCoord, zCoord, Aspect.FIRE, 10)>=10) {
if (FMLCommonHandler.instance().getEffectiveSide().isServer()) {
energySource.addEnergy(15F);
this.generating=15D;
}
}*/
if (tick-- == 0) {
updateSunState();
tick = 64;
}
}
@Override
public float calc_multi() {
if (VisNetHandler.drainVis(worldObj, xCoord, yCoord, zCoord, Aspect.FIRE, 10)>=10)
return 3F;
else if (this.worldObj.provider.dimensionId == (-1))
return 2F;
else
return 1F;
}
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(EMTBlocks.emtSolars, 1, 12);
}
@Override
public String getInventoryName() {
return "Compressed Ignis Solar";
}
}