From 10bbcff07751ecff590e7276d64eaad55707d1a1 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Sun, 1 Dec 2013 14:30:54 +0800 Subject: [PATCH] Fixed Multipart wires not loading --- .../induction/client/render/RenderPartWire.java | 6 +++--- .../induction/common/MekanismInduction.java | 9 +++++---- .../mekanism/induction/common/MultipartMI.java | 6 +++--- .../InsulationTiny.png} | Bin resources/assets/mekanism/render/wire.png | Bin 933 -> 702 bytes .../textures/blocks/models/insulation.png | Bin 5154 -> 0 bytes .../mekanism/textures/blocks/models/wire.png | Bin 702 -> 0 bytes 7 files changed, 11 insertions(+), 10 deletions(-) rename resources/assets/mekanism/{textures/blocks/models/insulationtiny.png => render/InsulationTiny.png} (100%) delete mode 100644 resources/assets/mekanism/textures/blocks/models/insulation.png delete mode 100644 resources/assets/mekanism/textures/blocks/models/wire.png diff --git a/common/mekanism/induction/client/render/RenderPartWire.java b/common/mekanism/induction/client/render/RenderPartWire.java index db191f50d..6fa42be42 100644 --- a/common/mekanism/induction/client/render/RenderPartWire.java +++ b/common/mekanism/induction/client/render/RenderPartWire.java @@ -134,9 +134,9 @@ public class RenderPartWire public static void registerIcons(IconRegister iconReg) { - wireIcon = iconReg.registerIcon("resonantinduction:models/wire"); - insulationIcon = iconReg.registerIcon("resonantinduction:models/insulation" + (MekanismInduction.LO_FI_INSULATION ? "tiny" : "")); - breakIcon = iconReg.registerIcon("resonantinduction:wire"); + wireIcon = iconReg.registerIcon(MekanismInduction.PREFIX + MekanismInduction.MODEL_TEXTURE_DIRECTORY + "Wire"); + insulationIcon = iconReg.registerIcon(MekanismInduction.PREFIX + MekanismInduction.MODEL_TEXTURE_DIRECTORY + "Insulation" + (MekanismInduction.LO_FI_INSULATION ? "Tiny" : "")); + breakIcon = iconReg.registerIcon(MekanismInduction.PREFIX + "wire"); } public void renderStatic(PartWire wire) diff --git a/common/mekanism/induction/common/MekanismInduction.java b/common/mekanism/induction/common/MekanismInduction.java index 42284aa97..5c3dda1bf 100644 --- a/common/mekanism/induction/common/MekanismInduction.java +++ b/common/mekanism/induction/common/MekanismInduction.java @@ -51,7 +51,7 @@ import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; -@Mod(modid = "MekanismInduction", name = "MekanismInduction", version = "5.6.0", dependencies = "required-after:Mekanism;after:MekanismGenerators") +@Mod(modid = "MekanismInduction", name = "MekanismInduction", version = "5.6.0", dependencies = "required-after:Mekanism;after:MekanismGenerators;after:ForgeMultipart") @NetworkMod(clientSideRequired = true, serverSideRequired = false) public class MekanismInduction implements IModule { @@ -150,7 +150,8 @@ public class MekanismInduction implements IModule { try { - itemPartWire = (Item) Class.forName("resonantinduction.wire.multipart.ItemPartWire").getConstructor(Integer.TYPE).newInstance(getNextItemID()); + itemPartWire = (Item) Class.forName("mekanism.induction.common.wire.ItemPartWire").getConstructor(Integer.TYPE).newInstance(getNextItemID()); + System.out.println("Mekanism Induction multipart loaded."); } catch (Exception e) { @@ -234,12 +235,12 @@ public class MekanismInduction implements IModule { try { - Class.forName("mekanism.induction.common..MultipartMI").newInstance(); + Class.forName("mekanism.induction.common.MultipartMI").newInstance(); } catch (Exception e) { e.printStackTrace(); - Mekanism.logger.severe("Failed to initiate Resonant Induction multipart module."); + Mekanism.logger.severe("Failed to initiate Mekanism Induction multipart module."); } } diff --git a/common/mekanism/induction/common/MultipartMI.java b/common/mekanism/induction/common/MultipartMI.java index 8d4c0ac67..2493735e5 100644 --- a/common/mekanism/induction/common/MultipartMI.java +++ b/common/mekanism/induction/common/MultipartMI.java @@ -28,9 +28,9 @@ public class MultipartMI implements IPartFactory MultiPartRegistry.registerParts(this, new String[] { "resonant_induction_wire" }); MultipartGenerator.registerPassThroughInterface("universalelectricity.core.block.IConductor"); MultipartGenerator.registerPassThroughInterface("buildcraft.api.power.IPowerReceptor"); - MultipartGenerator.registerPassThroughInterface("resonantinduction.wire.IInsulatedMaterial"); - MultipartGenerator.registerPassThroughInterface("resonantinduction.wire.multipart.IBlockableConnection"); - MultipartGenerator.registerTrait("ic2.api.energy.tile.IEnergySink", "resonantinduction.wire.multipart.javatraits.TEnergySink"); + MultipartGenerator.registerPassThroughInterface("mekanism.induction.common.wire.IInsulatedMaterial"); + MultipartGenerator.registerPassThroughInterface("mekanism.induction.common.wire.IBlockableConnection"); + MultipartGenerator.registerTrait("ic2.api.energy.tile.IEnergySink", "mekanism.induction.common.wire.TEnergySink"); } } diff --git a/resources/assets/mekanism/textures/blocks/models/insulationtiny.png b/resources/assets/mekanism/render/InsulationTiny.png similarity index 100% rename from resources/assets/mekanism/textures/blocks/models/insulationtiny.png rename to resources/assets/mekanism/render/InsulationTiny.png diff --git a/resources/assets/mekanism/render/wire.png b/resources/assets/mekanism/render/wire.png index 645ba053bd09c0b9c645eb2d633b431cc7e850e5..1244ffb742c6f1c77f7d4946c6674d6d3747a29b 100644 GIT binary patch delta 691 zcmV;k0!;m-2fhU}iBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^Z)<=24YJ` zL;(K){{a7>y{D6rO&EU%bV*G`2i*x66geMaYBRF{00K)%L_t(o!|j&KPP9xIgr7dp zGz^KvL*ilOrMWV0y$g44OuRNPL5U8iFxaPWMd$yM+0B^mTTHFU8v;dFy;ZrvP%CcmdroEnk z+%^m$FwZj~1b%*gaL!?^Wf+FNOR)6>#&M*oD%R^YN-305NGYl78X?5~J#cq-mqG}5 z?-|FDvMe#i(Dyw>QIJwXYmG4m?>$vj(f2)4N}8tO`T1GwB*8q-#2AS&QWQmgQCXIx zl(5#~y~jC6j1hn598yYz5TulL_rTZJ7gEYhqVIb`2vk*t)|wb2N~vr{=Nw8YthM_g zaB^}&jFF~kNGYL|!Wcu05o;}VU1P092!V4B?>*L9lu|nr;GYbl+uPeT3$-p652CZPGraczv~A1l>nkZG z-rwIjJw5$>0?W=^dI zq?9nmJguQKnQi{!HLrMwfT&~^46H-d1Y09!lDf5rZ0S6p#zySyB Zf004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000iY000iY0qR1r zzyJUM8gxZibW?9;ba!ELWdKlNX>N2bPDNB8b~7$DE-^7j^FlWO00RX{L_t(&L+zO9 zZt5@)g?U88TJ{zw`%c*@&{pbe&(&vXt|H66C2Y4pjASKFhRMvCGskff3G4Ur@*+=9 zPcoa$q}S_7yWN&_IxU4lLHhl^*!JhlJDrZSS}o&mG#bfpIF!L)AY8{M*SX(pHl@*M zT=a}{;yBBOKnQ}s7?n!J0Py_$EcJT*qTssSuDrg!3gGIf)oR8kqgt(s&H?(YK<{Nl z^5t^bREMBpL#b4fR4R2b0F%i?TmvRBV1P2=QkLBe4=O;VHF1)M1%PrXJ^4SCr^@&M zSdLU5|2(r;EJ{9~mt->eSO!2(Xs<~VBmw4fITIX#K~egXfU)PAvc!cvx__A2Kj%6*Oiqd<^6_es>{6MOtXd-d(= zb%Ykm0|JcjX~kUupwggDa#Wl-=X#C6Nj96!{uL`_2{x|a#^bS}JOGfKuh#*R{s&|j z;M0n`0s!h%i9o0v)Md_4I%-RB50I$5ili&J`Fw6{Hk*y9s;}12xZ`p{O`PR1nz+v60AMeR_VV{D z0brf~`uZ}J|M>VY>wa|pF92-4Kuh%h++)q>1qopB2}3y77a{fiUt55HzrVlDE9&WV zG6_WIKLHTc3p4~R!A}$b#1(M)MgS=5_1e4<#$nghw!V)Nt__WAqvBF@TQArYQDvB* z_ehih0JIfHSV4PSom3nLzK;^Na{D$aE=9NXgWVog1^|+z+JHi`B+gQc&@!hL;>3To zt#6}ZE4Oc>;!<>5FQ7X9Xa!A{76Ci}fJK1AGae3rZ=+%>w{N53QgmA{s5;33fVKjO z!YYnzwv++r#MM;|4gvxJfq+0jARrJB2nYlO0s;YnpAh&1OI2CTl0Kq)00000NkvXX Hu0mjff-az? diff --git a/resources/assets/mekanism/textures/blocks/models/insulation.png b/resources/assets/mekanism/textures/blocks/models/insulation.png deleted file mode 100644 index 2e57472f4dbf1c83efcd6fb152c4b8aaaf882247..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5154 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 V?xs|0(f(G@8R(c`UuZc+{|_w^eRBW+ diff --git a/resources/assets/mekanism/textures/blocks/models/wire.png b/resources/assets/mekanism/textures/blocks/models/wire.png deleted file mode 100644 index 1244ffb742c6f1c77f7d4946c6674d6d3747a29b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 702 zcmV;v0zv(WP)muO=IQB4?2CZjHY|z)DJAnf zBZOcaM*zyQWSXYEo`Bpo3?VSjGa&?ietvMyVXb8thP_L$^#sOoq^c^`>orO#lu}43 zsp}dc#Qr^ScXyXU2zc)q$C0uuF~-pMJw;KFQbKEuF$V8FRaMdVJyJ@Vrs4VdS?nai zJkP`!i7`?XMSf9PmZX%h*5bX#IY*2U=NwW>gb<{ZcK5*7*B4UCOrr05LI_knkZG-rwIjJw5$>0?W=^dIq?9nm