Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Some gear ratio fixes

Browse source
This commit is contained in:
Calclavia 2014-02-06 13:38:04 +08:00
parent b40e54afc8
commit 506e3bbeba
8 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/resonantinduction/core/Utility.java → src/main/java/resonantinduction/core/MultipartUtility.java
View file

@ -16,7 +16,7 @@ import codechicken.multipart.TileMultipart;
* @author Calclavia
*
*/
public class Utility
public class MultipartUtility
{
public static TileMultipart getMultipartTile(IBlockAccess access, BlockCoord pos)
{

4
src/main/java/resonantinduction/core/prefab/part/PartColorableMaterial.java
View file

@ -11,7 +11,7 @@ import net.minecraft.item.ItemShears;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.MovingObjectPosition;
import resonantinduction.core.Utility;
import resonantinduction.core.MultipartUtility;
import codechicken.lib.data.MCDataInput;
import codechicken.lib.data.MCDataOutput;
@ -120,7 +120,7 @@ public abstract class PartColorableMaterial<M extends Enum> extends PartAdvanced
{
if (itemStack != null)
{
int dyeColor = Utility.isDye(itemStack);
int dyeColor = MultipartUtility.isDye(itemStack);
if (dyeColor != -1 && this.isInsulated())
{

2
src/main/java/resonantinduction/electrical/generator/TileGenerator.java
View file

@ -32,7 +32,7 @@ public class TileGenerator extends TileElectrical implements IRotatable
public float toggleRatio()
{
return torqueRatio = (int) ((torqueRatio + 1000) % energy.getMaxExtract() + 1000);
return torqueRatio = (int) ((torqueRatio + 500) % (energy.getMaxExtract() / 2) + 500);
}
@Override

4
src/main/java/resonantinduction/electrical/tesla/BlockTesla.java
View file

@ -9,7 +9,7 @@ import net.minecraft.item.Item;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import resonantinduction.core.Reference;
import resonantinduction.core.Utility;
import resonantinduction.core.MultipartUtility;
import resonantinduction.core.render.RIBlockRenderingHandler;
import universalelectricity.api.UniversalElectricity;
import calclavia.lib.prefab.block.BlockSidedIO;
@ -45,7 +45,7 @@ public class BlockTesla extends BlockSidedIO implements ITileEntityProvider
if (entityPlayer.getCurrentEquippedItem() != null)
{
int dyeColor = Utility.isDye(entityPlayer.getCurrentEquippedItem());
int dyeColor = MultipartUtility.isDye(entityPlayer.getCurrentEquippedItem());
if (dyeColor != -1)
{

4
src/main/java/resonantinduction/electrical/wire/ItemWire.java
View file

@ -16,7 +16,7 @@ import org.lwjgl.input.Keyboard;
import resonantinduction.core.Reference;
import resonantinduction.core.Settings;
import resonantinduction.core.TabRI;
import resonantinduction.core.Utility;
import resonantinduction.core.MultipartUtility;
import resonantinduction.electrical.wire.flat.PartFlatWire;
import resonantinduction.electrical.wire.flat.RenderFlatWire;
import resonantinduction.electrical.wire.framed.PartFramedWire;
@ -68,7 +68,7 @@ public class ItemWire extends JItemMultiPart
}
else
{
if (!Utility.canPlaceWireOnSide(world, onPos.x, onPos.y, onPos.z, ForgeDirection.getOrientation(side), false))
if (!MultipartUtility.canPlaceWireOnSide(world, onPos.x, onPos.y, onPos.z, ForgeDirection.getOrientation(side), false))
{
return null;
}

4
src/main/java/resonantinduction/electrical/wire/PartAdvancedWire.java
View file

@ -13,7 +13,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.MovingObjectPosition;
import net.minecraftforge.common.ForgeDirection;
import resonantinduction.core.Utility;
import resonantinduction.core.MultipartUtility;
import universalelectricity.api.CompatibilityModule;
import universalelectricity.api.energy.IConductor;
import calclavia.lib.CustomDamageSource;
@ -204,7 +204,7 @@ public abstract class PartAdvancedWire extends PartConductor
{
if (itemStack != null)
{
int dyeColor = Utility.isDye(itemStack);
int dyeColor = MultipartUtility.isDye(itemStack);
if (dyeColor != -1 && this.isInsulated())
{

14
src/main/java/resonantinduction/electrical/wire/flat/PartFlatWire.java
View file

@ -15,7 +15,7 @@ import net.minecraftforge.common.ForgeDirection;
import org.lwjgl.opengl.GL11;
import resonantinduction.core.Utility;
import resonantinduction.core.MultipartUtility;
import resonantinduction.electrical.wire.EnumWireMaterial;
import resonantinduction.electrical.wire.PartAdvancedWire;
import calclavia.lib.render.EnumColor;
@ -339,7 +339,7 @@ public class PartFlatWire extends PartAdvancedWire implements TFacePart, JNormal
if (canConnectThroughCorner(cornerPos, absDir ^ 1, this.side))
{
cornerPos.offset(this.side);
TileMultipart tpCorner = Utility.getMultipartTile(world(), cornerPos);
TileMultipart tpCorner = MultipartUtility.getMultipartTile(world(), cornerPos);
if (tpCorner != null)
{
@ -408,7 +408,7 @@ public class PartFlatWire extends PartAdvancedWire implements TFacePart, JNormal
BlockCoord pos = new BlockCoord(tile()).offset(absSide);
/** Look for an external wire connection. */
TileMultipart t = Utility.getMultipartTile(world(), pos);
TileMultipart t = MultipartUtility.getMultipartTile(world(), pos);
if (t != null && r != -1)
{
@ -474,7 +474,7 @@ public class PartFlatWire extends PartAdvancedWire implements TFacePart, JNormal
public boolean canStay()
{
BlockCoord pos = new BlockCoord(tile()).offset(side);
return Utility.canPlaceWireOnSide(world(), pos.x, pos.y, pos.z, ForgeDirection.getOrientation(side ^ 1), false);
return MultipartUtility.canPlaceWireOnSide(world(), pos.x, pos.y, pos.z, ForgeDirection.getOrientation(side ^ 1), false);
}
public boolean dropIfCantStay()
@ -626,7 +626,7 @@ public class PartFlatWire extends PartAdvancedWire implements TFacePart, JNormal
return 0;
pos.offset(side);
TileMultipart t = Utility.getMultipartTile(world(), pos);
TileMultipart t = MultipartUtility.getMultipartTile(world(), pos);
if (t != null)
{
TMultiPart tp = t.partMap(absDir ^ 1);
@ -662,7 +662,7 @@ public class PartFlatWire extends PartAdvancedWire implements TFacePart, JNormal
return true;
}
TileMultipart t = Utility.getMultipartTile(world(), pos);
TileMultipart t = MultipartUtility.getMultipartTile(world(), pos);
if (t != null)
{
return t.partMap(side1) == null && t.partMap(side2) == null && t.partMap(PartMap.edgeBetween(side1, side2)) == null;
@ -677,7 +677,7 @@ public class PartFlatWire extends PartAdvancedWire implements TFacePart, JNormal
BlockCoord pos = new BlockCoord(tile()).offset(absDir);
TileMultipart t = Utility.getMultipartTile(world(), pos);
TileMultipart t = MultipartUtility.getMultipartTile(world(), pos);
if (t != null)
{
TMultiPart tp = t.partMap(side);

2
src/main/java/resonantinduction/mechanical/network/MechanicalNetwork.java
View file

@ -77,7 +77,7 @@ public class MechanicalNetwork extends Network<IMechanicalNetwork, IMechanical>
if (adjacentMech != null && adjacent != mechanical)
{
float ratio = adjacentMech.getRatio(dir) / mechanical.getRatio(dir.getOpposite());
float ratio = adjacentMech.getRatio(dir.getOpposite()) / mechanical.getRatio(dir);
long torque = mechanical.getTorque();
boolean inverseRotation = mechanical.inverseRotation(dir, adjacentMech) && adjacentMech.inverseRotation(dir.getOpposite(), mechanical);