tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Shuts down wind gens in space and HS

Browse source
This commit is contained in:
Bysokar 2019-07-28 08:07:47 +10:00
parent 9e0f71dae4
commit d9a16a7342
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nbproject/project.properties
View file

@ -29,10 +29,12 @@ dist.javadoc.dir=${dist.dir}/javadoc
excludes= excludes=
file.reference.api-java=src/api/java file.reference.api-java=src/api/java
file.reference.main-java=src/main/java file.reference.main-java=src/main/java
file.reference.RPCore-2.0.7.jar=C:\\Users\\draks\\Documents\\GitHub\\StargateMC\\common\\mods\\RPCore-2.0.7.jar
includes=** includes=**
jar.compress=false jar.compress=false
java.dir=${file.reference.main-java} java.dir=${file.reference.main-java}
javac.classpath= javac.classpath=\
${file.reference.RPCore-2.0.7.jar}
# Space-separated list of extra javac options # Space-separated list of extra javac options
javac.compilerargs= javac.compilerargs=
javac.deprecation=false javac.deprecation=false

10
src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java
View file

@ -1,5 +1,6 @@
package mekanism.generators.common.tile; package mekanism.generators.common.tile;
import buildcraft.api.core.Position;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import java.util.ArrayList; import java.util.ArrayList;
@ -13,6 +14,9 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import rpcore.api.DimensionAPI;
import rpcore.constants.CelestialType;
import rpcore.module.dimension.ForgeDimension;
public class TileEntityWindGenerator extends TileEntityGenerator implements IBoundingBlock public class TileEntityWindGenerator extends TileEntityGenerator implements IBoundingBlock
{ {
@ -40,7 +44,11 @@ public class TileEntityWindGenerator extends TileEntityGenerator implements IBou
{ {
setActive((currentMultiplier = getMultiplier()) > 0); setActive((currentMultiplier = getMultiplier()) > 0);
} }
ForgeDimension dim = ((ForgeDimension)DimensionAPI.getForgeDimension(this.worldObj.provider.dimensionId));
if (dim != null && (dim.getType().equals(CelestialType.System) || dim.getType().equals(CelestialType.Cluster)) && getActive()) {
setActive(false);
}
if(getActive()) if(getActive())
{ {
setEnergy(electricityStored + (generators.windGenerationMin*currentMultiplier)); setEnergy(electricityStored + (generators.windGenerationMin*currentMultiplier));