mirror of
https://github.com/GTNewHorizons/Draconic-Evolution.git
synced 2026-11-19 19:59:34 +00:00
Migrated Reactor Energy Injector and Stabilizer to use ComparatorMode
This commit is contained in:
1 parent
8f6712974d
commit
40cdb15191
5 files changed
+45
-64
No files matched your search
+2
-2
@@ -111,9 +111,9 @@ public class ReactorEnergyInjector extends BlockDE implements ITileEntityProvide
|
||||
TileEntity tile = world.getTileEntity(x, y, z);
|
||||
if (tile instanceof IReactorPart && player.isSneaking()) {
|
||||
IReactorPart part = (IReactorPart) tile;
|
||||
part.changeRedstoneMode();
|
||||
part.changeComparatorMode();
|
||||
if (!world.isRemote) {
|
||||
player.addChatComponentMessage(new ChatComponentText(part.getRedstoneModeAsString()));
|
||||
player.addChatComponentMessage(new ChatComponentText(part.getComparatorMode().toString()));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
+2
-2
@@ -51,9 +51,9 @@ public class ReactorStabilizer extends BlockDE implements ITileEntityProvider {
|
||||
if (tile instanceof IReactorPart) {
|
||||
IReactorPart part = (IReactorPart) tile;
|
||||
if (player.isSneaking()) {
|
||||
part.changeRedstoneMode();
|
||||
part.changeComparatorMode();
|
||||
if (!world.isRemote) {
|
||||
player.addChatComponentMessage(new ChatComponentText(part.getRedstoneModeAsString()));
|
||||
player.addChatComponentMessage(new ChatComponentText(part.getComparatorMode().toString()));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
+25
-24
@@ -20,6 +20,7 @@ import com.brandon3055.draconicevolution.client.ReactorSound;
|
||||
import com.brandon3055.draconicevolution.client.gui.GuiHandler;
|
||||
import com.brandon3055.draconicevolution.client.render.particle.Particles;
|
||||
import com.brandon3055.draconicevolution.common.blocks.multiblock.IReactorPart;
|
||||
import com.brandon3055.draconicevolution.common.blocks.multiblock.IReactorPart.ComparatorMode;
|
||||
import com.brandon3055.draconicevolution.common.blocks.multiblock.MultiblockHelper.TileLocation;
|
||||
import com.brandon3055.draconicevolution.common.handler.ConfigHandler;
|
||||
import com.brandon3055.draconicevolution.common.lib.References;
|
||||
@@ -496,47 +497,47 @@ public class TileReactorCore extends TileObjectSync {
|
||||
}
|
||||
}
|
||||
|
||||
public int getComparatorOutput(int redstoneMode) {
|
||||
switch (redstoneMode) {
|
||||
case IReactorPart.RMODE_TEMP:
|
||||
return toRedstoneStrength(reactionTemperature, maxReactTemperature, redstoneMode);
|
||||
case IReactorPart.RMODE_TEMP_INV:
|
||||
return 15 - toRedstoneStrength(reactionTemperature, maxReactTemperature, redstoneMode);
|
||||
case IReactorPart.RMODE_FIELD:
|
||||
return toRedstoneStrength(fieldCharge, maxFieldCharge, redstoneMode);
|
||||
case IReactorPart.RMODE_FIELD_INV:
|
||||
return 15 - toRedstoneStrength(fieldCharge, maxFieldCharge, redstoneMode);
|
||||
case IReactorPart.RMODE_SAT:
|
||||
return toRedstoneStrength(energySaturation, maxEnergySaturation, redstoneMode);
|
||||
case IReactorPart.RMODE_SAT_INV:
|
||||
return 15 - toRedstoneStrength(energySaturation, maxEnergySaturation, redstoneMode);
|
||||
case IReactorPart.RMODE_FUEL:
|
||||
return toRedstoneStrength(convertedFuel + conversionUnit, reactorFuel - conversionUnit, redstoneMode);
|
||||
case IReactorPart.RMODE_FUEL_INV:
|
||||
public int getComparatorOutput(ComparatorMode comparatorMode) {
|
||||
switch (comparatorMode) {
|
||||
case TEMPERATURE:
|
||||
return toRedstoneStrength(reactionTemperature, maxReactTemperature, comparatorMode);
|
||||
case TEMPERATURE_INVERTED:
|
||||
return 15 - toRedstoneStrength(reactionTemperature, maxReactTemperature, comparatorMode);
|
||||
case FIELD_CHARGE:
|
||||
return toRedstoneStrength(fieldCharge, maxFieldCharge, comparatorMode);
|
||||
case FIELD_CHARGE_INVERTED:
|
||||
return 15 - toRedstoneStrength(fieldCharge, maxFieldCharge, comparatorMode);
|
||||
case ENERGY_SATURATION:
|
||||
return toRedstoneStrength(energySaturation, maxEnergySaturation, comparatorMode);
|
||||
case ENERGY_SATURATION_INVERTED:
|
||||
return 15 - toRedstoneStrength(energySaturation, maxEnergySaturation, comparatorMode);
|
||||
case CONVERTED_FUEL:
|
||||
return toRedstoneStrength(convertedFuel + conversionUnit, reactorFuel - conversionUnit, comparatorMode);
|
||||
case CONVERTED_FUEL_INVERTED:
|
||||
return 15 - toRedstoneStrength(
|
||||
convertedFuel + conversionUnit,
|
||||
reactorFuel - conversionUnit,
|
||||
redstoneMode);
|
||||
comparatorMode);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
private int toRedstoneStrength(double value, double maxValue, int mode) {
|
||||
private int toRedstoneStrength(double value, double maxValue, ComparatorMode comparatorMode) {
|
||||
if (maxValue == 0) {
|
||||
return 0;
|
||||
}
|
||||
double proportion = value / maxValue;
|
||||
int redstoneStrength = (int) (proportion * 15D);
|
||||
switch (mode) {
|
||||
case IReactorPart.RMODE_FIELD:
|
||||
case IReactorPart.RMODE_FIELD_INV: {
|
||||
switch (comparatorMode) {
|
||||
case FIELD_CHARGE:
|
||||
case FIELD_CHARGE_INVERTED: {
|
||||
if (proportion < 0.1) {
|
||||
redstoneStrength = 0;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case IReactorPart.RMODE_FUEL:
|
||||
case IReactorPart.RMODE_FUEL_INV: {
|
||||
case CONVERTED_FUEL:
|
||||
case CONVERTED_FUEL_INVERTED: {
|
||||
if (proportion > 0.9) {
|
||||
redstoneStrength = 15;
|
||||
}
|
||||
|
||||
+8
-18
@@ -6,7 +6,6 @@ import net.minecraft.network.Packet;
|
||||
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import com.brandon3055.draconicevolution.DraconicEvolution;
|
||||
@@ -32,7 +31,7 @@ public class TileReactorEnergyInjector extends TileEntity implements IReactorPar
|
||||
@SideOnly(Side.CLIENT)
|
||||
private ParticleReactorBeam beam;
|
||||
|
||||
private int redstoneMode = IReactorPart.RMODE_TEMP;
|
||||
private ComparatorMode comparatorMode = ComparatorMode.TEMPERATURE;
|
||||
private int comparatorOutputCache = -1;
|
||||
|
||||
@Override
|
||||
@@ -44,7 +43,7 @@ public class TileReactorEnergyInjector extends TileEntity implements IReactorPar
|
||||
|
||||
TileReactorCore core = getMaster();
|
||||
if (core != null) {
|
||||
int comparatorOutput = core.getComparatorOutput(redstoneMode);
|
||||
int comparatorOutput = core.getComparatorOutput(comparatorMode);
|
||||
if (comparatorOutput != comparatorOutputCache) {
|
||||
comparatorOutputCache = comparatorOutput;
|
||||
worldObj.notifyBlocksOfNeighborChange(
|
||||
@@ -111,22 +110,13 @@ public class TileReactorEnergyInjector extends TileEntity implements IReactorPar
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRedstoneMode() {
|
||||
return redstoneMode;
|
||||
public ComparatorMode getComparatorMode() {
|
||||
return comparatorMode;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void changeRedstoneMode() {
|
||||
if (redstoneMode == IReactorPart.RMODE_FUEL_INV) {
|
||||
redstoneMode = IReactorPart.RMODE_TEMP;
|
||||
} else {
|
||||
redstoneMode++;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getRedstoneModeAsString() {
|
||||
return StatCollector.translateToLocal("msg.de.reactorRSMode." + redstoneMode + ".txt");
|
||||
public void changeComparatorMode() {
|
||||
comparatorMode = comparatorMode.next();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -153,7 +143,7 @@ public class TileReactorEnergyInjector extends TileEntity implements IReactorPar
|
||||
masterLocation.writeToNBT(compound, "Master");
|
||||
compound.setInteger("Facing", facing.ordinal());
|
||||
compound.setBoolean("IsValid", isValid);
|
||||
compound.setInteger("RedstoneMode", redstoneMode);
|
||||
compound.setInteger("RedstoneMode", comparatorMode.ordinal());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -162,7 +152,7 @@ public class TileReactorEnergyInjector extends TileEntity implements IReactorPar
|
||||
masterLocation.readFromNBT(compound, "Master");
|
||||
facing = ForgeDirection.getOrientation(compound.getInteger("Facing"));
|
||||
isValid = compound.getBoolean("IsValid");
|
||||
redstoneMode = compound.getInteger("RedstoneMode");
|
||||
comparatorMode = ComparatorMode.getMode(compound.getInteger("RedstoneMode"));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+8
-18
@@ -5,7 +5,6 @@ import net.minecraft.network.NetworkManager;
|
||||
import net.minecraft.network.Packet;
|
||||
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import com.brandon3055.draconicevolution.DraconicEvolution;
|
||||
@@ -33,7 +32,7 @@ public class TileReactorStabilizer extends TileEntity implements IReactorPart, I
|
||||
public TileLocation masterLocation = new TileLocation();
|
||||
public boolean isValid = false;
|
||||
public int tick = 0;
|
||||
private int redstoneMode = IReactorPart.RMODE_TEMP;
|
||||
private ComparatorMode comparatorMode = ComparatorMode.TEMPERATURE;
|
||||
private int comparatorOutputCache = -1;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@@ -62,7 +61,7 @@ public class TileReactorStabilizer extends TileEntity implements IReactorPart, I
|
||||
}
|
||||
}
|
||||
|
||||
int comparatorOutput = core.getComparatorOutput(redstoneMode);
|
||||
int comparatorOutput = core.getComparatorOutput(comparatorMode);
|
||||
if (comparatorOutput != comparatorOutputCache) {
|
||||
comparatorOutputCache = comparatorOutput;
|
||||
worldObj.notifyBlocksOfNeighborChange(
|
||||
@@ -150,22 +149,13 @@ public class TileReactorStabilizer extends TileEntity implements IReactorPart, I
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRedstoneMode() {
|
||||
return redstoneMode;
|
||||
public ComparatorMode getComparatorMode() {
|
||||
return comparatorMode;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void changeRedstoneMode() {
|
||||
if (redstoneMode == IReactorPart.RMODE_FUEL_INV) {
|
||||
redstoneMode = IReactorPart.RMODE_TEMP;
|
||||
} else {
|
||||
redstoneMode++;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getRedstoneModeAsString() {
|
||||
return StatCollector.translateToLocal("msg.de.reactorRSMode." + redstoneMode + ".txt");
|
||||
public void changeComparatorMode() {
|
||||
comparatorMode = comparatorMode.next();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -192,7 +182,7 @@ public class TileReactorStabilizer extends TileEntity implements IReactorPart, I
|
||||
masterLocation.writeToNBT(compound, "Master");
|
||||
compound.setInteger("Facing", facing.ordinal());
|
||||
compound.setBoolean("IsValid", isValid);
|
||||
compound.setInteger("RedstoneMode", redstoneMode);
|
||||
compound.setInteger("RedstoneMode", comparatorMode.ordinal());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -201,7 +191,7 @@ public class TileReactorStabilizer extends TileEntity implements IReactorPart, I
|
||||
masterLocation.readFromNBT(compound, "Master");
|
||||
facing = ForgeDirection.getOrientation(compound.getInteger("Facing"));
|
||||
isValid = compound.getBoolean("IsValid");
|
||||
redstoneMode = compound.getInteger("RedstoneMode");
|
||||
comparatorMode = ComparatorMode.getMode(compound.getInteger("RedstoneMode"));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user