diff --git a/src/main/java/resonantinduction/archaic/firebox/BlockHotPlate.java b/src/main/java/resonantinduction/archaic/firebox/BlockHotPlate.java index c2fad563c..65d929ca9 100644 --- a/src/main/java/resonantinduction/archaic/firebox/BlockHotPlate.java +++ b/src/main/java/resonantinduction/archaic/firebox/BlockHotPlate.java @@ -48,7 +48,7 @@ public class BlockHotPlate extends BlockRI public void registerIcons(IconRegister iconReg) { super.registerIcons(iconReg); - topElectric = iconReg.registerIcon(Reference.PREFIX + "material_steel"); + topElectric = iconReg.registerIcon(Reference.PREFIX + "electricHotPlate"); } @Override diff --git a/src/main/java/resonantinduction/core/resource/item/ItemOreResource.java b/src/main/java/resonantinduction/core/resource/item/ItemOreResource.java index 2313e7fdc..2719bc266 100644 --- a/src/main/java/resonantinduction/core/resource/item/ItemOreResource.java +++ b/src/main/java/resonantinduction/core/resource/item/ItemOreResource.java @@ -25,6 +25,7 @@ public class ItemOreResource extends ItemRI { super(name, id); setHasSubtypes(true); + setMaxDamage(0); } @Override diff --git a/src/main/java/resonantinduction/electrical/Electrical.java b/src/main/java/resonantinduction/electrical/Electrical.java index 29e4aca91..3be7b2668 100644 --- a/src/main/java/resonantinduction/electrical/Electrical.java +++ b/src/main/java/resonantinduction/electrical/Electrical.java @@ -33,7 +33,7 @@ import resonantinduction.electrical.generator.solar.TileSolarPanel; import resonantinduction.electrical.levitator.BlockLevitator; import resonantinduction.electrical.levitator.TileLevitator; import resonantinduction.electrical.multimeter.ItemMultimeter; -import resonantinduction.electrical.purifier.BlockPurifier; +import resonantinduction.electrical.purifier.BlockMixer; import resonantinduction.electrical.tesla.BlockTesla; import resonantinduction.electrical.tesla.TileTesla; import resonantinduction.electrical.transformer.ItemTransformer; diff --git a/src/main/java/resonantinduction/electrical/purifier/BlockPurifier.java b/src/main/java/resonantinduction/electrical/purifier/BlockMixer.java similarity index 91% rename from src/main/java/resonantinduction/electrical/purifier/BlockPurifier.java rename to src/main/java/resonantinduction/electrical/purifier/BlockMixer.java index e413bbee1..f287012ee 100644 --- a/src/main/java/resonantinduction/electrical/purifier/BlockPurifier.java +++ b/src/main/java/resonantinduction/electrical/purifier/BlockMixer.java @@ -15,11 +15,11 @@ import universalelectricity.api.vector.VectorWorld; * @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 diff --git a/src/main/java/resonantinduction/mechanical/Mechanical.java b/src/main/java/resonantinduction/mechanical/Mechanical.java index caa3fa912..5c73feb13 100644 --- a/src/main/java/resonantinduction/mechanical/Mechanical.java +++ b/src/main/java/resonantinduction/mechanical/Mechanical.java @@ -6,7 +6,7 @@ import net.minecraftforge.oredict.OreDictionary; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.core.Settings; -import resonantinduction.electrical.purifier.BlockPurifier; +import resonantinduction.electrical.purifier.BlockMixer; import resonantinduction.mechanical.belt.BlockConveyorBelt; import resonantinduction.mechanical.belt.TileConveyorBelt; import resonantinduction.mechanical.fluid.pipe.ItemBlockFluidContainer; @@ -112,7 +112,7 @@ public class Mechanical // Machines 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); diff --git a/src/main/java/resonantinduction/mechanical/process/BlockGrinderWheel.java b/src/main/java/resonantinduction/mechanical/process/BlockGrinderWheel.java index 920d0d877..d81a44199 100644 --- a/src/main/java/resonantinduction/mechanical/process/BlockGrinderWheel.java +++ b/src/main/java/resonantinduction/mechanical/process/BlockGrinderWheel.java @@ -8,6 +8,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.DamageSource; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; +import resonantinduction.core.Reference; import resonantinduction.core.Settings; import resonantinduction.core.prefab.block.BlockRIRotatable; import resonantinduction.core.render.RIBlockRenderingHandler; @@ -24,7 +25,8 @@ public class BlockGrinderWheel extends BlockRIRotatable implements ITileEntityPr public BlockGrinderWheel() { 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; } diff --git a/src/main/java/resonantinduction/mechanical/process/TileGrinderWheel.java b/src/main/java/resonantinduction/mechanical/process/TileGrinderWheel.java index 5c4c98aa4..10224b132 100644 --- a/src/main/java/resonantinduction/mechanical/process/TileGrinderWheel.java +++ b/src/main/java/resonantinduction/mechanical/process/TileGrinderWheel.java @@ -112,7 +112,7 @@ public class TileGrinderWheel extends TileMechanical implements IRotatable { 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; diff --git a/src/main/resources/assets/resonantinduction/languages/en_US.properties b/src/main/resources/assets/resonantinduction/languages/en_US.properties index ee2b31f31..ab89ed9ec 100644 --- a/src/main/resources/assets/resonantinduction/languages/en_US.properties +++ b/src/main/resources/assets/resonantinduction/languages/en_US.properties @@ -75,14 +75,17 @@ tile.resonantinduction\:fluidPipe.14.name=Magenta Wood Trough tile.resonantinduction\:fluidPipe.15.name=Orange Wood Trough tile.resonantinduction\:fluidPipe.16.name=White Wood Trough + +## Machines +tile.resonantinduction\:mixer.name=Mixer +tile.resonantinduction\:grindingWheel.name=Grinder Wheel + ### Electrical Module ## Blocks tile.resonantinduction\:tesla.name=Tesla Coil tile.resonantinduction\:levitator.name=Electromagnetic Levitator tile.resonantinduction\:battery.name=Battery tile.resonantinduction\:material.name=Material -tile.resonantinduction\:grindingWheel.name=Grinder Wheel -tile.resonantinduction\:purifier.name=Purifier Rotor tile.resonantinduction\:filter.name=Filter tile.resonantinduction\:armbot.name=Armbot tile.resonantinduction\:encoder.name=Encoder diff --git a/src/main/resources/assets/resonantinduction/sound/hotPlate.png b/src/main/resources/assets/resonantinduction/sound/hotPlate.png new file mode 100644 index 000000000..99da6965d Binary files /dev/null and b/src/main/resources/assets/resonantinduction/sound/hotPlate.png differ diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/electricHotPlate.png b/src/main/resources/assets/resonantinduction/textures/blocks/electricHotPlate.png new file mode 100644 index 000000000..590da9954 Binary files /dev/null and b/src/main/resources/assets/resonantinduction/textures/blocks/electricHotPlate.png differ