From 96de7fbdff0ae1496a61cc08bfc829e88c14c6f2 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Sat, 25 Jan 2014 00:30:15 +0800 Subject: [PATCH] Updated hot plate textures --- .../archaic/firebox/BlockHotPlate.java | 2 +- .../core/resource/item/ItemOreResource.java | 1 + .../resonantinduction/electrical/Electrical.java | 2 +- .../{BlockPurifier.java => BlockMixer.java} | 6 +++--- .../resonantinduction/mechanical/Mechanical.java | 4 ++-- .../mechanical/process/BlockGrinderWheel.java | 4 +++- .../mechanical/process/TileGrinderWheel.java | 2 +- .../resonantinduction/languages/en_US.properties | 7 +++++-- .../assets/resonantinduction/sound/hotPlate.png | Bin 0 -> 1383 bytes .../textures/blocks/electricHotPlate.png | Bin 0 -> 1305 bytes 10 files changed, 17 insertions(+), 11 deletions(-) rename src/main/java/resonantinduction/electrical/purifier/{BlockPurifier.java => BlockMixer.java} (91%) create mode 100644 src/main/resources/assets/resonantinduction/sound/hotPlate.png create mode 100644 src/main/resources/assets/resonantinduction/textures/blocks/electricHotPlate.png 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 0000000000000000000000000000000000000000..99da6965d6c0169ed71d6cb45ebe341f4cbec0de GIT binary patch literal 1383 zcmV-t1(^DYP)N2bPDNB8 zb~7$DE-^7j^FlWO00iSnL_t(oN5xlJPvb}s-d6-d;t7P1ctzZYMw(r;Nr*|}B#t4z z5<9kYCol*k;Qy<(zRI>^YiEP!CG*g--Q897bsb-||0tD8^gD+D=ytpG^z=mSc3Vaq z$JFcfnn}NV~V1P!Z4)4U_hSd$vb4H)2YaJIvv@s_PMSr zPuR0URz?Sd(O8{`G0^k^BYB$Q{nHr5c4cgw`PDZm@ zAcIFkE0A8grS4;eM%_A%{W|ZzXZbs_nnl{&+)Re0bBG`BY1paLq}xmYAS?-hkB<-e zaEyv<2%TzTv|6o_<2Ym(Ml$CbcjQ0ZQ^1Nl3^Zt0cuo_8Ka;_H->Wgurr3b3;c&PF zfP_*2d{zn}P1C4euhY%V4P9JZ(DCsxnWia;g!Ry_k=H7d+bmOLRm8|D8LY!o3c%aj z+Y$gO08hJ7p~zmG9*VB7uj%~!oX*b9M43{Eb-3SR<9NaYJ3BjH%1nJjY`~VvI{|<) zTL92xURD7w13l9NE$>FKE`zP!9#g5WSbR2MPNBZGY^2UO){LXZXk1t%vbGH?n! zp$tO-aLqev*Ovgkl1T#qKO_J^Fan@i5yg9ZdlE+oDrFcjfH}At``~*2p)88?$Or(o z0b3xc1b~W%V^(RvWd-H?`}^WTr2y|3M@L7p?zitLc6I7IH7XYVlpI(kgY`*Zhz;1v zRKfG}vwXO`IQAE{4`l}j2Z=(Q2H%H=hq4}V6$}~dz^hZOT#(bPlEM0{XNV2hdVhak z0#HPR#Q_sW#HWH03@AW+;bJw162w4VkGl;DY_14>0RksY%itUH{-Z_{-md_>yu2&{ zs3i1w5vKxcg^te5m1V-dyI{SZRinV-y}WP89tfBRIxS7uGvqRcK{dwArZy8--_ykd zumM}D^fO85w5s$Jw%Dx=jxp10N2h7f6uKR-ah$r(z~G_S!xSzmZWXvIm$+d2VB4Ba!*RUWja6z#(UT$^&U8lsL8S5(VkTqUHb)Ug)t~(fw|} zf1`?aOIur8|0{!zIN=Z|0JxYW0Mbkd4?y6n#)1C76p=ki~PUe#Ez-upMP(3&5)=jV|@iNgkLWqN_4#YcV7)AKeK001Mx^?7Ar1GaE4OaQ2l zGyo|0s<9vkyw>9Md1Vv;ge3u>NCED_ro4>>^^eN<6&V!*BxwRbWuzn_UmCD+Rb#5Wq+`7Bv?m`}scDWdH+i$q{=1T)#>Ngk_`vDEb!w>WYkB4G#pI**4#F{?k~v zL_=mZTts57>6i_Jf_rWB2A=19z0YwUk&pHNdWqwR1lZkw+ pb7X$aK0iO#{&Sk~!0#I+`Uhsi>%Zcd*#!Uq002ovPDHLkV1kmrZ|(p9 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..590da9954ffb1a5f9f8a850b41afe3321a5eb2e4 GIT binary patch literal 1305 zcmV+!1?KvRP)N2bPDNB8 zb~7$DE-^7j^FlWO00fmuL_t(oN5z+0Z{kQ0h4YX+g&SDFFn_xrM5uf_8`V^I{z`}@23 zKOT=|xm?O@HZ%VRgMs9EE^!>oXf%@Ha43_>M7rIs`OmqF#lp<*^?Jr%{emDczkHtW z`)2?KSEA3dcDrqU4FHMx>(`$?#rUi+49@^esRDdohsI9JzU=3L6mduLaa*#9&&)rrLOCwFl8rHU(k=nGEG592!JqU_sdcyLkr| zTm@4b`Oh-+z5%cah?WVQ&wQsZZPKkFYaTMvEdh$6I0LW)6yUJvA-$ceAa{3nm21EL zhsjVeYsmqD?J?S=e>U+DJ17CP?hF9iOaVw~PgG;T`}_OKJ*Jm$Z{JgM`LnJRKs)bh z30OGxB(>YyTNCi%;i0^jj+xf$Y|&i)C)Ab#P#;PF3XB5mP%w5NH75WH@38py0IV+s zph%Sfwho+D?j_KG_C2QmXG`Ytw*e|$kR(Y7@O|AwVR@B_GzPS<7hz3O`0bXy(E)pm zcIlr&OKgDset!nAh3FVVG$1Oo!Am88Z7jakup!B~0daXl%eG}Z`FR^|(W0kSPfiv< znx{l_wq_}yiV&|$|ICOLi#0IXq5#_Z z*F}h`W_8C%F#)nsL)PyNv)sKidsKFUH(Wt>6F{WX79P};xL=b|@V9s`UnKPYG;fq+U&xVu zs^SLO;PnE)qxO?bdvya~HM1LTh9Aqo%(#4M z1mNz;Wl{hhOiF;N5~2oB*_S~swLK2&5G|x0+b?Uz9;03Qo8>|=DnLaCR;!f-;8sGH zw(pi5Xn;FYF8>s;3Q*Y#R2DhNx3VXxxuq35=YR0$xj_MVE-V4`f`cqVJCK?yAX|%d zVEd`L{8?8DzyoRtV4nxJXcaqn9hxpK3{x(3T(>ViZMSf(!Ll<0UfdTF7 z!;*Rt$SLVLPeU&M0^Owml_juifR)Pg8xN3n0NbdRM`-&F**ZaJxEW1?n$wrI7`!60 zXl)d%0`R+`1kekUff&+?4A407GMEu6oP-Im#o2-K%X{=C(53%BN%%1aXr8bYK;_>6 z=n