Updated hot plate textures

This commit is contained in:
Calclavia 2014-01-25 00:30:15 +08:00
parent f54f3652b5
commit 96de7fbdff
10 changed files with 17 additions and 11 deletions

View file

@ -48,7 +48,7 @@ public class BlockHotPlate extends BlockRI
public void registerIcons(IconRegister iconReg) public void registerIcons(IconRegister iconReg)
{ {
super.registerIcons(iconReg); super.registerIcons(iconReg);
topElectric = iconReg.registerIcon(Reference.PREFIX + "material_steel"); topElectric = iconReg.registerIcon(Reference.PREFIX + "electricHotPlate");
} }
@Override @Override

View file

@ -25,6 +25,7 @@ public class ItemOreResource extends ItemRI
{ {
super(name, id); super(name, id);
setHasSubtypes(true); setHasSubtypes(true);
setMaxDamage(0);
} }
@Override @Override

View file

@ -33,7 +33,7 @@ import resonantinduction.electrical.generator.solar.TileSolarPanel;
import resonantinduction.electrical.levitator.BlockLevitator; import resonantinduction.electrical.levitator.BlockLevitator;
import resonantinduction.electrical.levitator.TileLevitator; import resonantinduction.electrical.levitator.TileLevitator;
import resonantinduction.electrical.multimeter.ItemMultimeter; import resonantinduction.electrical.multimeter.ItemMultimeter;
import resonantinduction.electrical.purifier.BlockPurifier; import resonantinduction.electrical.purifier.BlockMixer;
import resonantinduction.electrical.tesla.BlockTesla; import resonantinduction.electrical.tesla.BlockTesla;
import resonantinduction.electrical.tesla.TileTesla; import resonantinduction.electrical.tesla.TileTesla;
import resonantinduction.electrical.transformer.ItemTransformer; import resonantinduction.electrical.transformer.ItemTransformer;

View file

@ -15,11 +15,11 @@ import universalelectricity.api.vector.VectorWorld;
* @author Calclavia * @author Calclavia
* *
*/ */
public class BlockPurifier extends BlockRIRotatable implements ITileEntityProvider public class BlockMixer extends BlockRIRotatable implements ITileEntityProvider
{ {
public BlockPurifier() public BlockMixer()
{ {
super("purifier", Settings.getNextBlockID()); super("mixer", Settings.getNextBlockID());
} }
@Override @Override

View file

@ -6,7 +6,7 @@ import net.minecraftforge.oredict.OreDictionary;
import resonantinduction.core.Reference; import resonantinduction.core.Reference;
import resonantinduction.core.ResonantInduction; import resonantinduction.core.ResonantInduction;
import resonantinduction.core.Settings; import resonantinduction.core.Settings;
import resonantinduction.electrical.purifier.BlockPurifier; import resonantinduction.electrical.purifier.BlockMixer;
import resonantinduction.mechanical.belt.BlockConveyorBelt; import resonantinduction.mechanical.belt.BlockConveyorBelt;
import resonantinduction.mechanical.belt.TileConveyorBelt; import resonantinduction.mechanical.belt.TileConveyorBelt;
import resonantinduction.mechanical.fluid.pipe.ItemBlockFluidContainer; import resonantinduction.mechanical.fluid.pipe.ItemBlockFluidContainer;
@ -112,7 +112,7 @@ public class Mechanical
// Machines // Machines
blockGrinderWheel = contentRegistry.createTile(BlockGrinderWheel.class, TileGrinderWheel.class); blockGrinderWheel = contentRegistry.createTile(BlockGrinderWheel.class, TileGrinderWheel.class);
blockPurifier = contentRegistry.createTile(BlockPurifier.class, TilePurifier.class); blockPurifier = contentRegistry.createTile(BlockMixer.class, TilePurifier.class);
OreDictionary.registerOre("gear", itemGear); OreDictionary.registerOre("gear", itemGear);

View file

@ -8,6 +8,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.DamageSource; import net.minecraft.util.DamageSource;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import resonantinduction.core.Reference;
import resonantinduction.core.Settings; import resonantinduction.core.Settings;
import resonantinduction.core.prefab.block.BlockRIRotatable; import resonantinduction.core.prefab.block.BlockRIRotatable;
import resonantinduction.core.render.RIBlockRenderingHandler; import resonantinduction.core.render.RIBlockRenderingHandler;
@ -24,7 +25,8 @@ public class BlockGrinderWheel extends BlockRIRotatable implements ITileEntityPr
public BlockGrinderWheel() public BlockGrinderWheel()
{ {
super("grindingWheel", Settings.getNextBlockID()); super("grindingWheel", Settings.getNextBlockID());
this.setBlockBounds(0.05f, 0.05f, 0.05f, 0.95f, 0.95f, 0.95f); setTextureName(Reference.PREFIX + "material_steel_dark");
setBlockBounds(0.05f, 0.05f, 0.05f, 0.95f, 0.95f, 0.95f);
rotationMask = 0b111111; rotationMask = 0b111111;
} }

View file

@ -112,7 +112,7 @@ public class TileGrinderWheel extends TileMechanical implements IRotatable
{ {
if (this.ticks % 8 == 0) if (this.ticks % 8 == 0)
{ {
this.worldObj.playSoundEffect(this.xCoord + 0.5, this.yCoord + 0.5, this.zCoord + 0.5, Reference.PREFIX + "grinder", 0.5f, 1); worldObj.playSoundEffect(this.xCoord + 0.5, this.yCoord + 0.5, this.zCoord + 0.5, Reference.PREFIX + "grinder", 0.5f, 1);
} }
counter -= requiredTorque; counter -= requiredTorque;

View file

@ -75,14 +75,17 @@ tile.resonantinduction\:fluidPipe.14.name=Magenta Wood Trough
tile.resonantinduction\:fluidPipe.15.name=Orange Wood Trough tile.resonantinduction\:fluidPipe.15.name=Orange Wood Trough
tile.resonantinduction\:fluidPipe.16.name=White Wood Trough tile.resonantinduction\:fluidPipe.16.name=White Wood Trough
## Machines
tile.resonantinduction\:mixer.name=Mixer
tile.resonantinduction\:grindingWheel.name=Grinder Wheel
### Electrical Module ### Electrical Module
## Blocks ## Blocks
tile.resonantinduction\:tesla.name=Tesla Coil tile.resonantinduction\:tesla.name=Tesla Coil
tile.resonantinduction\:levitator.name=Electromagnetic Levitator tile.resonantinduction\:levitator.name=Electromagnetic Levitator
tile.resonantinduction\:battery.name=Battery tile.resonantinduction\:battery.name=Battery
tile.resonantinduction\:material.name=Material tile.resonantinduction\:material.name=Material
tile.resonantinduction\:grindingWheel.name=Grinder Wheel
tile.resonantinduction\:purifier.name=Purifier Rotor
tile.resonantinduction\:filter.name=Filter tile.resonantinduction\:filter.name=Filter
tile.resonantinduction\:armbot.name=Armbot tile.resonantinduction\:armbot.name=Armbot
tile.resonantinduction\:encoder.name=Encoder tile.resonantinduction\:encoder.name=Encoder

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB