tilera/IndustrialWires
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

The voltmeter can now measure the exact speed of a mechanical multiblock

Browse source
This commit is contained in:
malte0811 2018-04-06 18:05:11 +02:00
parent bd0c941ac8
commit 12510ecc5b
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/malte0811/industrialWires/converter/MechPartSpeedometer.java
View file

@ -15,8 +15,10 @@
package malte0811.industrialWires.converter;
import blusunrize.immersiveengineering.common.IEContent;
import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IPlayerInteraction;
import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IRedstoneOutput;
import blusunrize.immersiveengineering.common.items.ItemIETool;
import blusunrize.immersiveengineering.common.util.ChatUtils;
import blusunrize.immersiveengineering.common.util.Utils;
import malte0811.industrialWires.IndustrialWires;
@ -33,8 +35,11 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraftforge.oredict.OreDictionary;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.text.DecimalFormat;
import static blusunrize.immersiveengineering.common.IEContent.blockMetalDecoration0;
import static blusunrize.immersiveengineering.common.blocks.metal.BlockTypes_MetalDecoration0.RS_ENGINEERING;
@ -48,6 +53,7 @@ public class MechPartSpeedometer extends MechMBPart implements IPlayerInteractio
private int currentOutputLin = -1;
private int currentOutputLog = -1;
private double logFactor = 15 / Math.log(speedFor15RS + 1);
@Nullable
private MechEnergy energy = null;
@Override
@ -137,9 +143,14 @@ public class MechPartSpeedometer extends MechMBPart implements IPlayerInteractio
return SPEEDOMETER;
}
private static ItemStack voltMeter = ItemStack.EMPTY;
private static DecimalFormat format = new DecimalFormat("###.000");
@Override
public boolean interact(@Nonnull EnumFacing side, @Nonnull EntityPlayer player, @Nonnull EnumHand hand,
@Nonnull ItemStack heldItem, float hitX, float hitY, float hitZ) {
if (voltMeter.isEmpty()) {
voltMeter = new ItemStack(IEContent.itemTool, 1, ItemIETool.VOLTMETER_META);
}
if (Utils.isHammer(heldItem)) {
if (!world.isRemote) {
if (player.isSneaking()) {
@ -155,6 +166,12 @@ public class MechPartSpeedometer extends MechMBPart implements IPlayerInteractio
update(true);
}
return true;
} else if (OreDictionary.itemMatches(heldItem, voltMeter, false)) {
double speed = energy!=null?energy.getSpeed():0;
ChatUtils.sendServerNoSpamMessages(player,
new TextComponentTranslation(IndustrialWires.MODID + ".chat.currSpeed",
format.format(speed), format.format(speed*60D/(2*Math.PI))));
return true;
}
return false;
}

1
src/main/resources/assets/industrialwires/lang/en_US.lang
View file

@ -108,6 +108,7 @@ industrialwires.chat.tooLong=This coil does not contain enough wire for this con
industrialwires.chat.stackSize=Linking is only possible with a stack of size 1
industrialwires.chat.marxEnergy=Last discharge was %s kJ per block
industrialwires.chat.maxSpeed=Highest measurable speed: %s
industrialwires.chat.currSpeed=Current speed: %s radians/second = %s RPM
death.attack.industrialwires.jacobs_ladder=%1$s was electrocuted by a Jacob's Ladder
death.attack.industrialwires.marx=%1$s was struck by lightning produced by a Marx generator