mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Fixed Wind Generator model, fixed crashes
This commit is contained in:
1 parent
00e7a99cf3
commit
b83257d83b
4 files changed
+28
-7
No files matched your search
@@ -132,7 +132,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
|
||||
public TileComponentUpgrade upgradeComponent;
|
||||
public TileComponentEjector ejectorComponent;
|
||||
public TileComponentConfig configComponent;
|
||||
public TileComponentSecurity securityComponent;
|
||||
public TileComponentSecurity securityComponent = new TileComponentSecurity(this);
|
||||
|
||||
public TileEntityFactory()
|
||||
{
|
||||
@@ -160,8 +160,6 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
|
||||
|
||||
ejectorComponent = new TileComponentEjector(this);
|
||||
ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(2));
|
||||
|
||||
securityComponent = new TileComponentSecurity(this);
|
||||
}
|
||||
|
||||
public TileEntityFactory(FactoryTier type, MachineType machine)
|
||||
|
||||
@@ -18,6 +18,8 @@ import mekanism.common.base.ISustainedTank;
|
||||
import mekanism.common.base.IUpgradeTile;
|
||||
import mekanism.common.block.BlockMachine.MachineType;
|
||||
import mekanism.common.integration.IComputerIntegration;
|
||||
import mekanism.common.security.ISecurityTile;
|
||||
import mekanism.common.tile.component.TileComponentSecurity;
|
||||
import mekanism.common.tile.component.TileComponentUpgrade;
|
||||
import mekanism.common.util.ChargeUtils;
|
||||
import mekanism.common.util.FluidContainerUtils;
|
||||
@@ -40,7 +42,7 @@ import net.minecraftforge.fluids.FluidTankInfo;
|
||||
import net.minecraftforge.fluids.IFluidContainerItem;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
|
||||
public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implements IComputerIntegration, IConfigurable, IFluidHandler, ISustainedTank, IUpgradeTile, IRedstoneControl
|
||||
public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implements IComputerIntegration, IConfigurable, IFluidHandler, ISustainedTank, IUpgradeTile, IRedstoneControl, ISecurityTile
|
||||
{
|
||||
public Set<Coord4D> activeNodes = new HashSet<Coord4D>();
|
||||
public Set<Coord4D> usedNodes = new HashSet<Coord4D>();
|
||||
@@ -67,6 +69,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen
|
||||
private static EnumSet<ForgeDirection> dirs = EnumSet.complementOf(EnumSet.of(ForgeDirection.UP, ForgeDirection.UNKNOWN));
|
||||
|
||||
public TileComponentUpgrade upgradeComponent = new TileComponentUpgrade(this, 3);
|
||||
public TileComponentSecurity securityComponent = new TileComponentSecurity(this);
|
||||
|
||||
public TileEntityFluidicPlenisher()
|
||||
{
|
||||
@@ -557,4 +560,10 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileComponentSecurity getSecurity()
|
||||
{
|
||||
return securityComponent;
|
||||
}
|
||||
}
|
||||
@@ -13,6 +13,8 @@ import mekanism.common.base.IRedstoneControl;
|
||||
import mekanism.common.block.BlockMachine.MachineType;
|
||||
import mekanism.common.integration.IComputerIntegration;
|
||||
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
|
||||
import mekanism.common.security.ISecurityTile;
|
||||
import mekanism.common.tile.component.TileComponentSecurity;
|
||||
import mekanism.common.util.ChargeUtils;
|
||||
import mekanism.common.util.HeatUtils;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
@@ -21,7 +23,7 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock implements IHeatTransfer, IComputerIntegration, IRedstoneControl
|
||||
public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock implements IHeatTransfer, IComputerIntegration, IRedstoneControl, ISecurityTile
|
||||
{
|
||||
public double energyUsage = 100;
|
||||
|
||||
@@ -44,6 +46,8 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl
|
||||
|
||||
public RedstoneControl controlType = RedstoneControl.DISABLED;
|
||||
|
||||
public TileComponentSecurity securityComponent = new TileComponentSecurity(this);
|
||||
|
||||
public TileEntityResistiveHeater()
|
||||
{
|
||||
super("machine.resistiveheater", "ResistiveHeater", MachineType.RESISTIVE_HEATER.baseEnergy);
|
||||
@@ -341,4 +345,10 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileComponentSecurity getSecurity()
|
||||
{
|
||||
return securityComponent;
|
||||
}
|
||||
}
|
||||
@@ -166,8 +166,6 @@ public class ModelWindGenerator extends ModelBase
|
||||
plateConnector2.render(size);
|
||||
plateConnector.render(size);
|
||||
plate.render(size);
|
||||
bladeCap.render(size);
|
||||
bladeCenter.render(size);
|
||||
baseRim.render(size);
|
||||
base.render(size);
|
||||
wire.render(size);
|
||||
@@ -187,12 +185,18 @@ public class ModelWindGenerator extends ModelBase
|
||||
setRotation(blade3a, 0F, 0F, getRotation(getAbsoluteAngle(angle + 60)));
|
||||
setRotation(blade3b, 0F, 0F, 0.0349066F + getRotation(getAbsoluteAngle(angle + 60)));
|
||||
|
||||
setRotation(bladeCap, 0F, 0F, getRotation(getAbsoluteAngle(angle)));
|
||||
setRotation(bladeCenter, 0F, 0F, getRotation(getAbsoluteAngle(angle)));
|
||||
|
||||
blade1a.render(size);
|
||||
blade2a.render(size);
|
||||
blade3a.render(size);
|
||||
blade1b.render(size);
|
||||
blade2b.render(size);
|
||||
blade3b.render(size);
|
||||
|
||||
bladeCap.render(size);
|
||||
bladeCenter.render(size);
|
||||
}
|
||||
|
||||
public float getRotation(double angle)
|
||||
|
||||
Reference in new issue
Block a user