diff --git a/MMOKitchen.sln b/MMOKitchen.sln
index f0eaecc..850ef17 100644
--- a/MMOKitchen.sln
+++ b/MMOKitchen.sln
@@ -3,29 +3,27 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.3.32811.315
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MMOKitchen", "MMOKitchen\MMOKitchen.csproj", "{C98403A1-AA47-4987-94FE-C1CEF2E5CC85}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MMOKitchen", "MMOKitchen\MMOKitchen.csproj", "{008489AE-40DC-433A-8037-E846C6EAC883}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
BepInEx|Any CPU = BepInEx|Any CPU
Debug|Any CPU = Debug|Any CPU
- MelonLoader|Any CPU = MelonLoader|Any CPU
Release|Any CPU = Release|Any CPU
+ Workshop|Any CPU = Workshop|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {C98403A1-AA47-4987-94FE-C1CEF2E5CC85}.BepInEx|Any CPU.ActiveCfg = BepInEx|Any CPU
- {C98403A1-AA47-4987-94FE-C1CEF2E5CC85}.BepInEx|Any CPU.Build.0 = BepInEx|Any CPU
- {C98403A1-AA47-4987-94FE-C1CEF2E5CC85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {C98403A1-AA47-4987-94FE-C1CEF2E5CC85}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C98403A1-AA47-4987-94FE-C1CEF2E5CC85}.MelonLoader|Any CPU.ActiveCfg = MelonLoader|Any CPU
- {C98403A1-AA47-4987-94FE-C1CEF2E5CC85}.MelonLoader|Any CPU.Build.0 = MelonLoader|Any CPU
- {C98403A1-AA47-4987-94FE-C1CEF2E5CC85}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {C98403A1-AA47-4987-94FE-C1CEF2E5CC85}.Release|Any CPU.Build.0 = Release|Any CPU
+ {008489AE-40DC-433A-8037-E846C6EAC883}.BepInEx|Any CPU.ActiveCfg = BepInEx|Any CPU
+ {008489AE-40DC-433A-8037-E846C6EAC883}.BepInEx|Any CPU.Build.0 = BepInEx|Any CPU
+ {008489AE-40DC-433A-8037-E846C6EAC883}.Debug|Any CPU.ActiveCfg = Workshop|Any CPU
+ {008489AE-40DC-433A-8037-E846C6EAC883}.Release|Any CPU.ActiveCfg = Workshop|Any CPU
+ {008489AE-40DC-433A-8037-E846C6EAC883}.Workshop|Any CPU.ActiveCfg = Workshop|Any CPU
+ {008489AE-40DC-433A-8037-E846C6EAC883}.Workshop|Any CPU.Build.0 = Workshop|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {8C16E17F-BB46-4E9D-8899-92D742896BFB}
+ SolutionGuid = {AA51C7D7-1CC8-4304-9540-D214CFFF8597}
EndGlobalSection
EndGlobal
diff --git a/MMOKitchen/MMOKitchen.csproj b/MMOKitchen/MMOKitchen.csproj
index 988081a..53f2619 100644
--- a/MMOKitchen/MMOKitchen.csproj
+++ b/MMOKitchen/MMOKitchen.csproj
@@ -1,101 +1,69 @@
-
-
-
+
+
- Debug
- AnyCPU
- {C98403A1-AA47-4987-94FE-C1CEF2E5CC85}
- Library
- Properties
- MMOKitchen
- MMOKitchen
- v4.7.1
- 512
- true
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
- true
- bin\MelonLoader\
- TRACE;DEBUG;MELONLOADER
- full
- AnyCPU
- 7.3
- prompt
-
-
- true
- bin\BepInEx\
- TRACE;DEBUG;BEPINEX
- full
- AnyCPU
- 7.3
- prompt
+ net472
+ BepInEx;Workshop
+ $(MSBuildProjectName)-$(Configuration)
+
-
- ..\..\..\..\Libraries\BepInEx\core\0Harmony.dll
-
+
+ ..\..\..\..\Libraries\0Harmony.dll
+
+
+ ..\..\..\..\Libraries\PlateUp_Data\Managed\Discord.dll
+
+
+ ..\..\..\..\Libraries\PlateUp_Data\Managed\Facepunch.Steamworks.Win64.dll
+
+
+ ..\..\..\..\Libraries\PlateUp_Data\Managed\Kitchen.Common.dll
+
+
+ ..\..\..\..\Libraries\PlateUp_Data\Managed\Kitchen.FranchiseBuilderMode.dll
+
+
+ ..\..\..\..\Libraries\PlateUp_Data\Managed\Kitchen.FranchiseMode.dll
+
+
+ ..\..\..\..\Libraries\PlateUp_Data\Managed\Kitchen.GameData.dll
+
+
+ ..\..\..\..\Libraries\PlateUp_Data\Managed\Kitchen.Layouts.dll
+
+
+ ..\..\..\..\Libraries\PlateUp_Data\Managed\Kitchen.Networking.dll
+
+
+ ..\..\..\..\Libraries\PlateUp_Data\Managed\Kitchen.Persistence.dll
+
+
+ ..\..\..\..\Libraries\PlateUp_Data\Managed\Kitchen.PostgameMode.dll
+
+
+ ..\..\..\..\Libraries\PlateUp_Data\Managed\Kitchen.ResearchMode.dll
+
+
+ ..\..\..\..\Libraries\PlateUp_Data\Managed\Kitchen.RestaurantMode.dll
+
+
+ ..\..\..\..\Libraries\PlateUp_Data\Managed\Kitchen.TutorialMode.dll
+
+
+ ..\..\..\..\Libraries\KitchenLib\KitchenLib-Workshop.dll
+
+
+ ..\..\..\..\Libraries\KitchenLib\KitchenLib-BepInEx.dll
+
..\..\..\..\Libraries\BepInEx\core\BepInEx.dll
-
- ..\..\..\..\Libraries\PlateUp_Data\Managed\Discord.dll
-
-
- ..\..\..\..\Libraries\PlateUp_Data\Managed\Facepunch.Steamworks.Win64.dll
-
-
- ..\..\..\..\Libraries\PlateUp_Data\Managed\Kitchen.Common.dll
-
-
- ..\..\..\..\Libraries\PlateUp_Data\Managed\Kitchen.FranchiseMode.dll
-
-
- ..\..\..\..\Libraries\PlateUp_Data\Managed\Kitchen.GameData.dll
-
-
- ..\..\..\..\Libraries\PlateUp_Data\Managed\Kitchen.Layouts.dll
-
-
- ..\..\..\..\Libraries\PlateUp_Data\Managed\Kitchen.Networking.dll
-
-
- ..\..\..\..\Libraries\KitchenLib\KitchenLib-BepInEx.dll
-
..\..\..\..\Libraries\PlateUp_Data\Managed\KitchenMode.dll
-
- ..\..\..\..\Libraries\MelonLoader\MelonLoader.dll
+
+ ..\..\..\..\Libraries\PlateUp_Data\Managed\KitchenMods.dll
-
- ..\..\..\..\Libraries\PlateUp_Data\Managed\Sirenix.Serialization.dll
-
-
-
-
-
-
-
-
-
..\..\..\..\Libraries\PlateUp_Data\Managed\Unity.Entities.dll
@@ -106,16 +74,5 @@
..\..\..\..\Libraries\PlateUp_Data\Managed\UnityEngine.CoreModule.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
diff --git a/MMOKitchen/Main.cs b/MMOKitchen/Main.cs
new file mode 100644
index 0000000..6f2e294
--- /dev/null
+++ b/MMOKitchen/Main.cs
@@ -0,0 +1,34 @@
+using KitchenLib;
+using System.Reflection;
+using KitchenLib.Utils;
+using UnityEngine;
+using System;
+#if BEPINEX
+using BepInEx;
+#endif
+
+namespace MMOKitchen
+{
+#if BEPINEX
+ [BepInProcess("PlateUp.exe")]
+ [BepInPlugin(MOD_ID, MOD_NAME, MOD_VERSION)]
+#endif
+ public class Main : BaseMod
+ {
+ public const string MOD_ID = "mmokitchen";
+ public const string MOD_NAME = "MMO Kitchen";
+ public const string MOD_AUTHOR = "StarFluxGames";
+ public const string MOD_VERSION = "0.1.5";
+ public const string MOD_COMPATIBLE_VERSIONS = "1.1.2";
+ public Main() : base(MOD_ID, MOD_NAME, MOD_AUTHOR, MOD_VERSION, MOD_COMPATIBLE_VERSIONS, Assembly.GetExecutingAssembly()) { }
+
+ public static Texture2D LoadImage(string base64)
+ {
+ byte[] bytes = Convert.FromBase64String(base64);
+
+ Texture2D image = ResourceUtils.LoadTextureRaw(bytes);
+
+ return image;
+ }
+ }
+}
\ No newline at end of file
diff --git a/MMOKitchen/Mod.cs b/MMOKitchen/Mod.cs
deleted file mode 100644
index 2fb26a4..0000000
--- a/MMOKitchen/Mod.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using KitchenLib;
-using System.Reflection;
-#if BEPINEX
-using BepInEx;
-#endif
-#if MELONLOADER
-using MelonLoader;
-#endif
-
-#if MELONLOADER
-[assembly: MelonInfo(typeof(MMOKitchen.Mod), "MMO Kitchen", "0.1.4", "StarFluxGames")]
-[assembly: MelonGame("It's Happening", "PlateUp")]
-#endif
-namespace MMOKitchen
-{
-#if BEPINEX
- [BepInProcess("PlateUp.exe")]
- [BepInPlugin("starfluxgames.mmokitchen", "MMO Kitchen", "0.1.4")]
- [BepInDependency(KitchenLib.Mod.GUID)]
-#endif
- public class Mod : BaseMod
- {
-#if MELONLOADER
- public Mod() : base("mmokitchen", "1.1.1") { }
-#endif
-#if BEPINEX
- public Mod() : base("1.1.1", Assembly.GetExecutingAssembly()) { }
-#endif
- }
-}
\ No newline at end of file
diff --git a/MMOKitchen/Patches/CreateBedrooms_Patch.cs b/MMOKitchen/Patches/CreateBedrooms_Patch.cs
index 26972ab..20d9acc 100644
--- a/MMOKitchen/Patches/CreateBedrooms_Patch.cs
+++ b/MMOKitchen/Patches/CreateBedrooms_Patch.cs
@@ -9,6 +9,7 @@ using Unity.Collections;
namespace MMOKitchen
{
+
[HarmonyPatch(typeof(CreateBedrooms), "OnUpdate")]
public class CreateBedrooms_Patch
{
@@ -62,4 +63,5 @@ namespace MMOKitchen
return false;
}
}
+
}
\ No newline at end of file
diff --git a/MMOKitchen/Patches/CreateGarage_Patch.cs b/MMOKitchen/Patches/CreateGarage_Patch.cs
index 5aa3e95..a3b042c 100644
--- a/MMOKitchen/Patches/CreateGarage_Patch.cs
+++ b/MMOKitchen/Patches/CreateGarage_Patch.cs
@@ -9,7 +9,8 @@ using KitchenData;
namespace MMOKitchen
{
- [HarmonyPatch(typeof(CreateGarage), "OnUpdate")]
+
+ [HarmonyPatch(typeof(CreateGarage), "OnUpdate")]
public class CreateGarage_Patch
{
public static bool Prefix(CreateGarage __instance)
@@ -56,4 +57,5 @@ namespace MMOKitchen
return false;
}
}
+
}
\ No newline at end of file
diff --git a/MMOKitchen/Patches/FeaturesFromTexture_Patch.cs b/MMOKitchen/Patches/FeaturesFromTexture_Patch.cs
index 49992c3..96570e4 100644
--- a/MMOKitchen/Patches/FeaturesFromTexture_Patch.cs
+++ b/MMOKitchen/Patches/FeaturesFromTexture_Patch.cs
@@ -7,12 +7,14 @@ using System.IO;
namespace MMOKitchen
{
+
[HarmonyPatch(typeof(FeaturesFromTexture), "ActOn")]
public class FeaturesFromTexture_Patch
{
public static void Prefix(NewFromTexture __instance)
{
- __instance.SourceTexture = ResourceUtils.LoadTextureFromFile(Path.Combine(Application.streamingAssetsPath, "FeaturesFromTexture.png"));
- }
- }
+ __instance.SourceTexture = Main.LoadImage("iVBORw0KGgoAAAANSUhEUgAAAB4AAAAQCAMAAAA25D/gAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAMUExURQD/ACQA/+nKIQAAAOiZT8gAAAAEdFJOU////wBAKqn0AAAACXBIWXMAAA6/AAAOvwE4BVMkAAAASUlEQVQoU52MyQ0AIAgEBfrv2StcYTXReSAyLE2u/Og2p7uAjTComihrZ32ITse9U5KuvKSh3kTFrMXSNTkxPV6wAUPgOOaqRToQCQU9rUN4jgAAAABJRU5ErkJggg==");
+ }
+ }
+
}
\ No newline at end of file
diff --git a/MMOKitchen/Patches/LayoutBuilder_Patch.cs b/MMOKitchen/Patches/LayoutBuilder_Patch.cs
index 0b5ba14..32777e2 100644
--- a/MMOKitchen/Patches/LayoutBuilder_Patch.cs
+++ b/MMOKitchen/Patches/LayoutBuilder_Patch.cs
@@ -4,6 +4,7 @@ using UnityEngine;
namespace MMOKitchen
{
+
[HarmonyPatch(typeof(LayoutBuilder), "BuildWallBetween")]
public class LayoutBuilder_Patch
{
@@ -17,4 +18,5 @@ namespace MMOKitchen
return true;
}
}
+
}
\ No newline at end of file
diff --git a/MMOKitchen/Patches/LobbyTransaction_Patch.cs b/MMOKitchen/Patches/LobbyTransaction_Patch.cs
index ff87931..bfc70e6 100644
--- a/MMOKitchen/Patches/LobbyTransaction_Patch.cs
+++ b/MMOKitchen/Patches/LobbyTransaction_Patch.cs
@@ -6,6 +6,7 @@ using System.Reflection.Emit;
namespace MMOKitchen
{
+
[HarmonyPatch(typeof(DiscordPlatform))]
[HarmonyPatch("CreateNewLobby")]
public static class DiscordPlatform_Patch
@@ -20,4 +21,5 @@ namespace MMOKitchen
return codes;
}
}
+
}
\ No newline at end of file
diff --git a/MMOKitchen/Patches/NewFromTexture_Patch.cs b/MMOKitchen/Patches/NewFromTexture_Patch.cs
index 0536c79..fba8ef9 100644
--- a/MMOKitchen/Patches/NewFromTexture_Patch.cs
+++ b/MMOKitchen/Patches/NewFromTexture_Patch.cs
@@ -6,8 +6,12 @@ using System.Reflection;
using Unity.Entities;
using KitchenLib.Utils;
using System.IO;
+using System.Collections.Generic;
+using System;
+
namespace MMOKitchen
{
+
[HarmonyPatch(typeof(NewFromTexture), "ActOn")]
public class NewFromTexture_Patch
{
@@ -16,8 +20,9 @@ namespace MMOKitchen
PlayerManager playerManager = World.DefaultGameObjectInjectionWorld.GetExistingSystem();
FieldInfo finfo = typeof(PlayerManager).GetField("MaxPlayers", BindingFlags.Instance | BindingFlags.Public);
finfo.SetValue(playerManager, 12);
-
- __instance.SourceTexture = ResourceUtils.LoadTextureFromFile(Path.Combine(Application.streamingAssetsPath, "NewFromTexture.png"));
- }
- }
+
+ __instance.SourceTexture = Main.LoadImage("iVBORw0KGgoAAAANSUhEUgAAAB4AAAAQCAMAAAA25D/gAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAhUExURe0cJIgAFTHf77eA6hbzSv9/J//yAIC66hY68//JDgAAANY41qIAAAALdFJOU/////////////8ASk8B8gAAAAlwSFlzAAAOvwAADr8BOAVTJAAAAF1JREFUKFOl0UkOgDAMQ9Gamdz/wMRuQCVIgOAtIuG/qih2qxA66d1A0KhE3/PoUgY08qSMSiNPm6M5jTxFnzkfnvLkIs87aOR5lReJeMqru2SNPD+zWbyhFb/TbAPTUQgZqLo2tAAAAABJRU5ErkJggg==");
+ }
+ }
+
}
\ No newline at end of file
diff --git a/MMOKitchen/Patches/SteamPlatform_Patch.cs b/MMOKitchen/Patches/SteamPlatform_Patch.cs
index fb1c0ca..c4effec 100644
--- a/MMOKitchen/Patches/SteamPlatform_Patch.cs
+++ b/MMOKitchen/Patches/SteamPlatform_Patch.cs
@@ -33,4 +33,5 @@ namespace MMOKitchen
return false;
}
}
+
}
\ No newline at end of file
diff --git a/MMOKitchen/Properties/AssemblyInfo.cs b/MMOKitchen/Properties/AssemblyInfo.cs
deleted file mode 100644
index b322649..0000000
--- a/MMOKitchen/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("MMOKitchen")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("MMOKitchen")]
-[assembly: AssemblyCopyright("Copyright © 2022")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("c98403a1-aa47-4987-94fe-c1cef2e5cc85")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]