diff --git a/src/main/java/resonantinduction/electrical/generator/BlockGenerator.java b/src/main/java/resonantinduction/electrical/generator/BlockGenerator.java index 2675d500..aaac3d19 100644 --- a/src/main/java/resonantinduction/electrical/generator/BlockGenerator.java +++ b/src/main/java/resonantinduction/electrical/generator/BlockGenerator.java @@ -1,5 +1,6 @@ package resonantinduction.electrical.generator; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import resonantinduction.core.prefab.block.BlockRIRotatable; @@ -14,6 +15,19 @@ public class BlockGenerator extends BlockRIRotatable super("generator"); } + @Override + public boolean onUseWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ) + { + TileEntity tileEntity = world.getBlockTileEntity(x, y, z); + + if (tileEntity instanceof TileGenerator) + { + ((TileGenerator) tileEntity).isInversed = !((TileGenerator) tileEntity).isInversed; + return true; + } + return false; + } + @Override public TileEntity createNewTileEntity(World world) { diff --git a/src/main/java/resonantinduction/electrical/generator/TileGenerator.java b/src/main/java/resonantinduction/electrical/generator/TileGenerator.java index c319692e..53054aa9 100644 --- a/src/main/java/resonantinduction/electrical/generator/TileGenerator.java +++ b/src/main/java/resonantinduction/electrical/generator/TileGenerator.java @@ -15,7 +15,7 @@ public class TileGenerator extends TileElectrical implements IMechanical private long power; /** Generator turns KE -> EE. Inverted one will turn EE -> KE. */ - private boolean isInversed = false; + public boolean isInversed = false; public TileGenerator() { diff --git a/src/main/java/resonantinduction/mechanical/gear/PartGear.java b/src/main/java/resonantinduction/mechanical/gear/PartGear.java index 7b01008a..de5965ca 100644 --- a/src/main/java/resonantinduction/mechanical/gear/PartGear.java +++ b/src/main/java/resonantinduction/mechanical/gear/PartGear.java @@ -144,12 +144,12 @@ public class PartGear extends JCuboidPart implements JNormalOcclusion, TFacePart @Override public boolean activate(EntityPlayer player, MovingObjectPosition hit, ItemStack item) { - System.out.println("Torque" + this.torque); + System.out.println("Torque" + this.torque + " Angular Velocity" + this.angularVelocity); if (player.isSneaking()) { this.torque += 10; - this.angularVelocity += 1; + this.angularVelocity += 0.1f; } return false; diff --git a/src/main/resources/assets/resonantinduction/textures/models/128x128Blank.png b/src/main/resources/assets/resonantinduction/textures/models/128x128Blank.png deleted file mode 100644 index 5c67c068..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/128x128Blank.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/256x256Blank.png b/src/main/resources/assets/resonantinduction/textures/models/256x256Blank.png deleted file mode 100644 index b17230be..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/256x256Blank.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/AdvancedHopper.png b/src/main/resources/assets/resonantinduction/textures/models/AdvancedHopper.png deleted file mode 100644 index 97dffd53..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/AdvancedHopper.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/ConstructionPump.png b/src/main/resources/assets/resonantinduction/textures/models/ConstructionPump.png deleted file mode 100644 index 1e47b823..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/ConstructionPump.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/CornerTank.png b/src/main/resources/assets/resonantinduction/textures/models/CornerTank.png deleted file mode 100644 index 43e1ddef..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/CornerTank.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/CrusherBlock.png b/src/main/resources/assets/resonantinduction/textures/models/CrusherBlock.png deleted file mode 100644 index 9d2ff6a3..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/CrusherBlock.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/ElecFurnace.png b/src/main/resources/assets/resonantinduction/textures/models/ElecFurnace.png deleted file mode 100644 index 0ced2762..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/ElecFurnace.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/FluidCanA.png b/src/main/resources/assets/resonantinduction/textures/models/FluidCanA.png deleted file mode 100644 index 4e264709..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/FluidCanA.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/Furnace.png b/src/main/resources/assets/resonantinduction/textures/models/Furnace.png deleted file mode 100644 index a3eca675..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/Furnace.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/GearShaftPiston.png b/src/main/resources/assets/resonantinduction/textures/models/GearShaftPiston.png deleted file mode 100644 index fa16d1d6..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/GearShaftPiston.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/GrinderBlock.png b/src/main/resources/assets/resonantinduction/textures/models/GrinderBlock.png deleted file mode 100644 index 2845df62..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/GrinderBlock.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/LaserGun.png b/src/main/resources/assets/resonantinduction/textures/models/LaserGun.png deleted file mode 100644 index 6530c640..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/LaserGun.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/LaserTile.png b/src/main/resources/assets/resonantinduction/textures/models/LaserTile.png deleted file mode 100644 index 9852ef93..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/LaserTile.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/Sink.png b/src/main/resources/assets/resonantinduction/textures/models/Sink.png deleted file mode 100644 index 0d973dfd..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/Sink.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/SmallSteamFan.png b/src/main/resources/assets/resonantinduction/textures/models/SmallSteamFan.png deleted file mode 100644 index 545d0c1a..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/SmallSteamFan.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/SteamGenerator.png b/src/main/resources/assets/resonantinduction/textures/models/SteamGenerator.png deleted file mode 100644 index 25fb22ad..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/SteamGenerator.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/TankSide.png b/src/main/resources/assets/resonantinduction/textures/models/TankSide.png deleted file mode 100644 index 24c78389..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/TankSide.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/TestCar.png b/src/main/resources/assets/resonantinduction/textures/models/TestCar.png deleted file mode 100644 index 27b50644..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/TestCar.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/Turkey.png b/src/main/resources/assets/resonantinduction/textures/models/Turkey.png deleted file mode 100644 index fb23e13d..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/Turkey.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/armbot_old.png b/src/main/resources/assets/resonantinduction/textures/models/armbot_old.png deleted file mode 100644 index a1a44b2e..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/armbot_old.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/cheeseTexture.png b/src/main/resources/assets/resonantinduction/textures/models/cheeseTexture.png deleted file mode 100644 index ff263792..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/cheeseTexture.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/crane_controller_off.png b/src/main/resources/assets/resonantinduction/textures/models/crane_controller_off.png deleted file mode 100644 index 08e15bfe..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/crane_controller_off.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/crane_controller_on.png b/src/main/resources/assets/resonantinduction/textures/models/crane_controller_on.png deleted file mode 100644 index 1634f508..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/crane_controller_on.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/crane_frame.png b/src/main/resources/assets/resonantinduction/textures/models/crane_frame.png deleted file mode 100644 index 280107ac..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/crane_frame.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/em_contractor.png b/src/main/resources/assets/resonantinduction/textures/models/em_contractor.png deleted file mode 100644 index 5ec275b6..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/em_contractor.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/em_contractor_push.png b/src/main/resources/assets/resonantinduction/textures/models/em_contractor_push.png deleted file mode 100644 index ba10e0e7..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/em_contractor_push.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/fadedSphere.png b/src/main/resources/assets/resonantinduction/textures/models/fadedSphere.png deleted file mode 100644 index f2f38796..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/fadedSphere.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/frackingpipe.png b/src/main/resources/assets/resonantinduction/textures/models/frackingpipe.png deleted file mode 100644 index 816ab001..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/frackingpipe.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/gear_shaft_piston.png b/src/main/resources/assets/resonantinduction/textures/models/gear_shaft_piston.png deleted file mode 100644 index fa16d1d6..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/gear_shaft_piston.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/grey.png b/src/main/resources/assets/resonantinduction/textures/models/grey.png deleted file mode 100644 index 2f853402..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/grey.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/injector.png b/src/main/resources/assets/resonantinduction/textures/models/injector.png deleted file mode 100644 index f63471e5..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/injector.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/insulation.png b/src/main/resources/assets/resonantinduction/textures/models/insulation.png deleted file mode 100644 index 68b25d7e..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/insulation.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/laser_drill.png b/src/main/resources/assets/resonantinduction/textures/models/laser_drill.png deleted file mode 100644 index 5ebaa7b0..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/laser_drill.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/mechanical/GearRod.png b/src/main/resources/assets/resonantinduction/textures/models/mechanical/GearRod.png deleted file mode 100644 index 11f4720d..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/mechanical/GearRod.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/mechanical/Generator.png b/src/main/resources/assets/resonantinduction/textures/models/mechanical/Generator.png deleted file mode 100644 index 32a3ae90..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/mechanical/Generator.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/multimeter.png b/src/main/resources/assets/resonantinduction/textures/models/multimeter.png deleted file mode 100644 index 869357fc..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/multimeter.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/quarryControllerOn.png b/src/main/resources/assets/resonantinduction/textures/models/quarryControllerOn.png deleted file mode 100644 index f36357ab..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/quarryControllerOn.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/tankTexture.png b/src/main/resources/assets/resonantinduction/textures/models/tankTexture.png deleted file mode 100644 index 82b85311..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/tankTexture.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/tesla_bottom.png b/src/main/resources/assets/resonantinduction/textures/models/tesla_bottom.png deleted file mode 100644 index 9d24ed37..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/tesla_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/tesla_middle.png b/src/main/resources/assets/resonantinduction/textures/models/tesla_middle.png deleted file mode 100644 index 574870f0..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/tesla_middle.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/tesla_top.png b/src/main/resources/assets/resonantinduction/textures/models/tesla_top.png deleted file mode 100644 index 3d100f53..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/tesla_top.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/transformer.png b/src/main/resources/assets/resonantinduction/textures/models/transformer.png deleted file mode 100644 index bc0e5f3d..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/transformer.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/white.png b/src/main/resources/assets/resonantinduction/textures/models/white.png deleted file mode 100644 index 84dab38f..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/white.png and /dev/null differ diff --git a/src/main/resources/assets/resonantinduction/textures/models/wire.png b/src/main/resources/assets/resonantinduction/textures/models/wire.png deleted file mode 100644 index 645ba053..00000000 Binary files a/src/main/resources/assets/resonantinduction/textures/models/wire.png and /dev/null differ