From 140d6b0f0ea98ff7696602fee31f5f82ca7bdfbc Mon Sep 17 00:00:00 2001 From: Skullywag Date: Wed, 20 Apr 2016 00:12:22 +0100 Subject: [PATCH] fixed duplicate detour --- Assemblies/ReclaimFabric.dll | Bin 7680 -> 7680 bytes Source/.vs/ReclaimFabric/v14/.suo | Bin 211968 -> 210432 bytes Source/ReclaimFabric/DetourInjector.cs | 1 - .../ReclaimFabric/bin/Debug/ReclaimFabric.dll | Bin 7680 -> 7680 bytes .../ReclaimFabric/bin/Debug/ReclaimFabric.pdb | Bin 15872 -> 15872 bytes .../ReclaimFabric/obj/Debug/ReclaimFabric.dll | Bin 7680 -> 7680 bytes .../ReclaimFabric/obj/Debug/ReclaimFabric.pdb | Bin 15872 -> 15872 bytes 7 files changed, 1 deletion(-) diff --git a/Assemblies/ReclaimFabric.dll b/Assemblies/ReclaimFabric.dll index c4718c90bd3c3dae1cbca2e9e946c099a969fe7b..665e3a5596759c65b515c28dd81716d64a8e0df1 100644 GIT binary patch delta 343 zcmZp$X|S2l!ECu(Y+|=82Z(?2UX@|`mqBj_IfF2G9 z*}??G(}4H`(7PYR7#M3f delta 341 zcmZp$X|S2l!F+3$z{GA@#zzxZhBNj}W@J=ny<@__ATwE!NoR5-qdMb@$&HNlf`?2Q zz`z4YGBL0+JeVxVh+9R)%~C zkI|J4Sx$>x3#hV!4=Q0N2;Yz^WjD1O`7XH{S&G*D{w}s^9l#Y%wlUc-@gtkFF57Kl2#8#N7 dD8_hb@_O;`&3qESn3 diff --git a/Source/.vs/ReclaimFabric/v14/.suo b/Source/.vs/ReclaimFabric/v14/.suo index dc12987920ed09ddfb145728bbfaac749400c466..202f97a7d7ea63ae71157deff91ec5a9f05ccb03 100644 GIT binary patch delta 1605 zcmdtgZAep57zgnCjC;qOF3H){)bOPR%lcp#edtAm)cTMi)Jh6Nu?T`>)=G-V5tOg# z^bjjU%BYaY!j0OOGGZ9wmtHKf7i*Qho0-irOV|IjyBe89(5Ei^_B{7F=broAb7mdU zTKl!O#k8w#Nt9G42!fftPtmuUZN$c@NE&oc+g$4`R@D+UGZLeyl1&%qPz%cxOXv~1 zEEdv3mMATvS1eD8Pkf98wt^2=o)XU@?t_ic#2Teok&m)Vk}+CBsTlUaZr}sui0mtw zCF{-^{MBkZg*T%%hOu!_BS#amzlo*P$SUO2pjKj4MFLBcA~gk=xB<|a=4WROsPN8A zFrhQeUR2k^7`rOXjGL@I-lii&t1jh9KBjL113ZOoupO%46nMZ2cGv;@8U8JSYaMFG zlzO2O`B;*Ymmr>jWH_zVvivbQu!c`WVU03agLnwCmHQaPEBsLF%xdWZZaV!pI=bsm zBIyQCN`1bY7`+8ua2xJGH}n917vKMT$nV1g=!JOL0@YxICt!g-cm~hm1-yg>@EYDg z1-yj;cn51AV2}a;EjKUWn7Csc=&}qX;`4jo5{LL{mVt(Klcnlmv zCh8}Fui1cTQ}RC^g9#I-z-;A#;A7zX7K8f#dkjfl1NA$HvsQ(Pk@!%SlWJfoD$!{% z<*bz>P%#9mgH2QGTQcNm-0K51%w(399GP!A|37_y91|VqmeVimoxdK&-0FFDOD?Sz zb%DA3Ro*tORNs*yx1-n=JYeZKOU{IA9=f=K+@zrd49*IgVE1OzTxUY3CxW^ex!di> z?JAwKXTV4&JgRiw(|!_!8sIs<4j?asa;ShxsDf%Z2(@4XJFxVjIL%=sM_|0Q;3zrz zylK?$8cw26>7OjG|FOKkJ^!z(*hpQW6Sl);nNQXFNwz}05c?tvuF++rR@IvfF2hQS S5BdFumw9u^<;_)Td%pphqz9G& delta 1482 zcmb`FTSydP6vyYx&MdpSE$OmaTDUG7nD(F;J#-Pl6kp1v+!VtothW-aDMKo)C^L$5 zKWu}D#E4$Jq!Vrz-LhRv?P6~|1wKR&M4*h|L+>Y(u9 zZi6MmmGj~DgF~PS@P^l6FM~F44qO6!7=D(Ue<;ajZn=fTgWw48fH&YcI053X$6~MH zx9agpgPv$m1MRLsZ!q|7_)U783;O^J=y91KWC)TTB%1Bh<1YMVhwmbyT_6KI2Pzl_ ziR>W!$KVNg3Z8)xFbYC|@8$*U7DCT4FaZg2R`{Ni4Bc*YCsf|Ic$eVE?kj7Gag1=+o^+ z-FE4guOV?(ex;_B-l<#jP*j~S+iRDc_yXoF^sszUQWc-K%90L+-_(T4v|g_z3xdNa zDt%tdID|BVsA_$c^hd>kX}gv9YIyRml1iw8h0O)37P86y-pD`nOkL7*+$Q=XJ1x8i zzmbU^suJlX)ipKa=+VTU8F6T$gsc=n#u`HwQzk2{f(yz9gPOb*fd$|M#=eSqYVPN$ zB8mp*-IOf*=ait5Lm!eYd>CWTpt6~+Ifu(BY+72BX_K3n%O?dryD2M)g-r!a2~|qQ qY1*`E3ToA&?NisB*c>Qcpq#*WJEaC6<(tYScGH>5x}C0N$oL5rKlHi) diff --git a/Source/ReclaimFabric/DetourInjector.cs b/Source/ReclaimFabric/DetourInjector.cs index 618817c..a5c8a54 100644 --- a/Source/ReclaimFabric/DetourInjector.cs +++ b/Source/ReclaimFabric/DetourInjector.cs @@ -17,7 +17,6 @@ public override bool Inject() { MethodInfo method1 = typeof(Thing).GetMethod("SmeltProducts", BindingFlags.Instance | BindingFlags.Public); MethodInfo method2 = typeof(_Thing).GetMethod("_SmeltProducts", BindingFlags.Static | BindingFlags.NonPublic); - Detours.TryDetourFromTo(method1, method2); if (!Detours.TryDetourFromTo(method1, method2)) { return false; diff --git a/Source/ReclaimFabric/bin/Debug/ReclaimFabric.dll b/Source/ReclaimFabric/bin/Debug/ReclaimFabric.dll index c4718c90bd3c3dae1cbca2e9e946c099a969fe7b..665e3a5596759c65b515c28dd81716d64a8e0df1 100644 GIT binary patch delta 343 zcmZp$X|S2l!ECu(Y+|=82Z(?2UX@|`mqBj_IfF2G9 z*}??G(}4H`(7PYR7#M3f delta 341 zcmZp$X|S2l!F+3$z{GA@#zzxZhBNj}W@J=ny<@__ATwE!NoR5-qdMb@$&HNlf`?2Q zz`z4YGBL0+JeVxVh+9R)%~C zkI|J4Sx$>x3#hV!4=Q0N2;Yz^WjD1O`7XH{S&G*D{w}s^9l#Y%wlUc-@gtkFF57Kl2#8#N7 dD8_hb@_O;`&3qESn3 diff --git a/Source/ReclaimFabric/bin/Debug/ReclaimFabric.pdb b/Source/ReclaimFabric/bin/Debug/ReclaimFabric.pdb index 9160f0d8d7ff38bc02a15b6c6febc3229dba61cc..89a157e2bff681b46f7f6e5733c55d679fcc00eb 100644 GIT binary patch delta 339 zcmZpuX{g!2!X;t3TP&QBfq~(_W6i$@LRWp8jxnqY@S4cAS%yo8L*&l=;Dw(zp5WST z8oYYV9Sx@oe^wT3bX>#88Nv+I0|X(P1x3Cyv&~#qd1u0`$$S!ZEDVd%qBl>Fn8L`I zI$2dpnKc!tigEHr1^dlCQZ_)r%_pV3Sr|Pgiz;X{dTe%7=wno46$83}iGhvb6Hsjn z$XFm?1VRr8lYtXRS4{q@sBCNnWW9U;ufY~bi!v}Y*a2xVAngRCC4jUWkd_3}oD5tH zybKjUT)jD5X(i*t0G>%IDnJWWRo=35y?O*x#-MP(Mr^Z;P5=wzoXxog(u|BA6CH&o kC#Zp3x6n`;=>ENi+KeHSUm8l|2__>6CdP)%rY5I30s38DH2?qr delta 348 zcmZpuX{g!2!XWjIc>Gty z|Je0sj2^3A?c;pD(QyqUXACn?4-mv`78Lo;%yzou6X&aGlldg-SkhkIsoOk3VhST; z?qpRdW!7AvD#pnh73??nNZ9}dH=mUDW?>ANEUKW*7_iw2Z(?2UX@|`mqBj_IfF2G9 z*}??G(}4H`(7PYR7#M3f delta 341 zcmZp$X|S2l!F+3$z{GA@#zzxZhBNj}W@J=ny<@__ATwE!NoR5-qdMb@$&HNlf`?2Q zz`z4YGBL0+JeVxVh+9R)%~C zkI|J4Sx$>x3#hV!4=Q0N2;Yz^WjD1O`7XH{S&G*D{w}s^9l#Y%wlUc-@gtkFF57Kl2#8#N7 dD8_hb@_O;`&3qESn3 diff --git a/Source/ReclaimFabric/obj/Debug/ReclaimFabric.pdb b/Source/ReclaimFabric/obj/Debug/ReclaimFabric.pdb index 9160f0d8d7ff38bc02a15b6c6febc3229dba61cc..89a157e2bff681b46f7f6e5733c55d679fcc00eb 100644 GIT binary patch delta 339 zcmZpuX{g!2!X;t3TP&QBfq~(_W6i$@LRWp8jxnqY@S4cAS%yo8L*&l=;Dw(zp5WST z8oYYV9Sx@oe^wT3bX>#88Nv+I0|X(P1x3Cyv&~#qd1u0`$$S!ZEDVd%qBl>Fn8L`I zI$2dpnKc!tigEHr1^dlCQZ_)r%_pV3Sr|Pgiz;X{dTe%7=wno46$83}iGhvb6Hsjn z$XFm?1VRr8lYtXRS4{q@sBCNnWW9U;ufY~bi!v}Y*a2xVAngRCC4jUWkd_3}oD5tH zybKjUT)jD5X(i*t0G>%IDnJWWRo=35y?O*x#-MP(Mr^Z;P5=wzoXxog(u|BA6CH&o kC#Zp3x6n`;=>ENi+KeHSUm8l|2__>6CdP)%rY5I30s38DH2?qr delta 348 zcmZpuX{g!2!XWjIc>Gty z|Je0sj2^3A?c;pD(QyqUXACn?4-mv`78Lo;%yzou6X&aGlldg-SkhkIsoOk3VhST; z?qpRdW!7AvD#pnh73??nNZ9}dH=mUDW?>ANEUKW*7_iw