From 907b2f9fe13f3e005a95047693327327e1223ab0 Mon Sep 17 00:00:00 2001 From: DaemonBeast Date: Sat, 13 Mar 2021 15:11:39 +0000 Subject: [PATCH] Fixed custom regions Changed StaticRegionInfo to DnsRegionInfo --- Unify/Patches/Regions.cs | 39 +++++++++++++++++++------------------- Unify/Unify.cs | 2 +- Unify/Unify.csproj | 4 ++-- build/Unify-2021.3.5s.dll | Bin 6656 -> 6656 bytes 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/Unify/Patches/Regions.cs b/Unify/Patches/Regions.cs index 3ff28ea..8de95e3 100644 --- a/Unify/Patches/Regions.cs +++ b/Unify/Patches/Regions.cs @@ -1,5 +1,9 @@ using System.Collections.Generic; +using System.Linq; using BepInEx.Configuration; +using BepInEx.Preloader.Core; +using HarmonyLib; +using UnityEngine; using Array = System.Array; using String = System.String; @@ -9,21 +13,17 @@ namespace Unify.Patches { private static IRegionInfo[] _newRegions = new IRegionInfo[] { - new StaticRegionInfo("skeld.net", StringNames.NoTranslation, "192.241.154.115", new ServerInfo[] - { - new ServerInfo("skeld.net-Master-1", "192.241.154.115", 22023) - }).Duplicate(), - new StaticRegionInfo("localhost", StringNames.NoTranslation, "127.0.0.1", new ServerInfo[] - { - new ServerInfo("localhost", "127.0.0.1", 22023) - }).Duplicate() + new DnsRegionInfo("192.241.154.115", "skeld.net", StringNames.NoTranslation, "192.241.154.115") + .Duplicate(), + new DnsRegionInfo("localhost", "localhost", StringNames.NoTranslation, "127.0.0.1") + .Duplicate() }; - private static IRegionInfo[] _customRegions = MergeRegions(_newRegions, LoadCustomRegions()); + private static IRegionInfo[] _customRegions = MergeRegions(_newRegions, LoadCustomUserRegions()); public static void Patch() { IRegionInfo[] patchedRegions = MergeRegions(ServerManager.DefaultRegions, _customRegions); - + ServerManager.DefaultRegions = patchedRegions; ServerManager.Instance.AvailableRegions = patchedRegions; ServerManager.Instance.SaveServers(); @@ -38,23 +38,22 @@ namespace Unify.Patches return patchedRegions; } - private static IRegionInfo[] LoadCustomRegions() + private static IRegionInfo[] LoadCustomUserRegions() { List customRegions = new List(); for (int x = 0; x < 5; x++) { - ConfigEntry regionName = UnifyPlugin.ConfigFile.Bind($"Region {x + 1}", $"Name", "custom region"); - ConfigEntry regionIp = UnifyPlugin.ConfigFile.Bind($"Region {x + 1}", "IP", ""); - ConfigEntry regionPort = UnifyPlugin.ConfigFile.Bind($"Region {x + 1}", "Port", (ushort) 22023); - + ConfigEntry regionName = UnifyPlugin.ConfigFile.Bind( + $"Region {x + 1}", $"Name", "custom region"); + ConfigEntry regionIp = UnifyPlugin.ConfigFile.Bind( + $"Region {x + 1}", "IP", ""); + if (String.IsNullOrWhiteSpace(regionIp.Value)) continue; - IRegionInfo regionInfo = new StaticRegionInfo( - regionName.Value, StringNames.NoTranslation, regionIp.Value, new ServerInfo[] - { - new ServerInfo(regionName.Value, regionIp.Value, regionPort.Value) - }).Duplicate(); + IRegionInfo regionInfo = new DnsRegionInfo( + regionIp.Value, regionName.Value, StringNames.NoTranslation, regionIp.Value) + .Duplicate(); customRegions.Add(regionInfo); } diff --git a/Unify/Unify.cs b/Unify/Unify.cs index 9cf7870..ab05b09 100644 --- a/Unify/Unify.cs +++ b/Unify/Unify.cs @@ -15,7 +15,7 @@ namespace Unify { public const string Id = "daemon.unify.reactor"; private const string Name = "Unify"; - private const string Version = "2.0.0"; + private const string Version = "2.0.1"; public static readonly ConfigFile ConfigFile = new ConfigFile(Path.Combine(Paths.ConfigPath, $"{UnifyPlugin.Id}.cfg"), true); diff --git a/Unify/Unify.csproj b/Unify/Unify.csproj index 16bb826..2b16178 100644 --- a/Unify/Unify.csproj +++ b/Unify/Unify.csproj @@ -1,7 +1,7 @@ netstandard2.1 - 2.0.0 + 2.0.1 NuclearPowered/Mappings:0.2.0 Region mod for Reactor @@ -14,7 +14,7 @@ - 2020.11.17i + 2021.11.17i $(DefineConstants);ITCH diff --git a/build/Unify-2021.3.5s.dll b/build/Unify-2021.3.5s.dll index 43c6e8ff35110f1d9d9fb2891524e00f89041a6e..f9e2d5052bb98b54444bb5c7b72cf20dc78cb322 100644 GIT binary patch delta 1721 zcmZ9Ndu&ui6vn@E@9b`OTQ2)(w_93dm-1)}U3Lo!1P!1>9*P#Q1QIKtAgPtMbZdwZ zx+@_D2pTun@JJd0^be5uB26^JB>@r@A`pxbHIb+RM1s)s5A|lEgQk~Vbe3dIoebuu!3=Iu=J8LL3Ad>RoMdsEe z_7+Dhz;dF<`KU&%St&Y$rM%<+JpNO0nP`w&;KEPW?%bTO68aRnl zYTRSZ3aIS`3aq&Ts9o06-PW-_qeoHj6GE+J843X)NVj%=%fflA&(nX`O?W0&OrXcP zf>}|*%i=ZBZS_=VnND{%s;+@QtYYn8$l8Jc64GFYF{t|BMY9y_04mf;<;Bm|Mz#j* zlPZ8cR06m_PK1Y}^x~MhXGO7=H;v+Laum|oMG6^3g!g$!>seMh$cr!8!HWib%%ls@ zV0*C~S~+9gvjSLZH`q~hnRNF}e9|f~CTG|#@7bI1qtW-sQTAGI&0*_p(F_^;BV(U8 ze8wnQ+F3p0=QTJo{R<*$Ur`=ozac@Kvu@dq9G(Zub6;`XOLCJ%bF3Y~BV3ynB=8+p zB7|ObgPck>$929pOMX``GtUa+eSwQ;rT0p)E!JmiZ(G*5`PgAQNB5xd_TZAGz2Ay$ zn4nrjP?G>l9*?UtV&hWLGyOPiMptv$Eo4;!I&~GUTbg}#JN!ne$7QRF4GLC&) zaRU9SS3(%XcA1O=)&V&Ik$ySH)}!Q;a-5Oh;1lw5RgfR_9kcR_>3oyCBlpR6b~2+j z3>j7#CJgHh(}oTdH7rj`nn1vtq1$RsX zk1>lrkGjls#UH8PVr+{UhvToZzdoHlYQ;W4ue-z_N$)bz|7+1to6{aH0rUC;8hO_D z`+Eke0z;NPuOs6=G~(3gRWH4k>FM0Cblv*4&W;S8?p(9>38S=R)^)pgM|`L=)w`FR zI`^WpscB4_yP}Ef*Mw=@D@k4t)6%uJ5XqpOo8VQfrPe{K$2~H#F?eIv9|a@Nm#=r2$(H4uvZDfyJ| EA0tXGV*mgE delta 1895 zcmZuyeQZ-z6#t#~ZeKsPm42=5*oQ6KWDL4=fP<;Xmjvd98O$wUm_T5V3aq287!_;* zBTgZqzKFp~SR7Gxc z8>NFR$+3Vh4Hg_92b?Pa$P9a?na$d%fE`zq5ALK7a5(&V)6cMAw(CK2p*~&S(>*{} z$l3<@;ug_1gnrh6oF3R!#4A+#bB>(m7I79G$*~N*RmIXQVW=u) z@LCMFC0@psHLxVlT0FDj)~#Dc{0I9&8ZG67RQ?-n9WK=ji86DRsF=|ufbyq#C;4u(u-%eM#5&g| zWsMi@K$KW(ZGkTjaIscCzqR3hzE?0GG<(GO!tu)4AJbecoh)|vG!42^`3@oFQx&swrNErA<+rnPIJ|rCIVa0*7jN{?sDh<3PgziTd zFY3pB#<8fy9!6sH!^`>0q@L!RoMhlL4lq!SW1MsW>ez0BR8DDvmwZI8<8&K2%#Y0~ zsZA|&w|0`}>{R$T4eC!p{!9jX=}pZ*Qfp%GO_Eru?01xXR^h{}qz$~lL_Y5_30$B2 zxG+w?BrM9_N-mtyuImv_Ye8G)3$A`qW;#i%(Y>hS9co1w7qAp=bc-JtA7X3{$$Zb+ zu8B3AXNh7T<4d$Ndo(*4k)$<=QPPK<$SnHv=X5t3?5m`5f@2E zklTxyij&VksODYK@Vp44pEDQXswS~tUkAHVCg3}*i+_q4l;Se`_4Jdd=UX>st4R%v zLx^FO_>Eiqn9#__SV%E!5@9Mqh$d4vIxvlumqa`ELbuE&i4RZ($F}1r4vX#N#$V{B zN$ArK(oq!98#GnfCwR`=bg#;Jn(dDk(`hWG&pG%!&N6-~zNT;4@e}>1(p_Z?XhiA> z6uK1_DGV!|ps-e9J@uQ1tfez`x=c05qdyqERI1gWnC@gOr*_7P6l0u1n;7q*7a8Z$ ztBj4*$Jj!BrrlPaz9F9By(Dg&8*tJ@+Dtukgx({O$u$sf`0%)-c0JcNQsN_|h@t$l zCFPiR8*PX3XuQV1(Z6ywZddc5t)O9-I+}psb{rXdl%aDo6CcUk$jwuM!-@j~%8Fnw zMX=xe)0WD6aNeAGjm`5HG&VH7w%)EAEvc2M*eWxgf4rzEzH;^4$C9b|hQ%FgWAV-; zmakIOY$`Zx{#|gO)ZUCZ5=a5wB-ZgESdZ1HK_^=&nERaJipu}%5iGvRWMElLw1ZbkvpoQhkGkWNmg46Y|nM?pxC)4hSiB{Sc3HP9B*>fTZut>O2S zgJ79lGitVW#@0N+FQWbKV*j8A_=cy9jGNL9Wy5~sic$x@cUO_=^kw+Zclay}yzJXZ jT)o|YjgbOVEK%N^D8KiH>>MNCm#*3YcknW0qt<@_`PW2q