From c81ae1fd153a338d9ee0566fbf693ba1664b09bc Mon Sep 17 00:00:00 2001 From: Lachlan Leone Date: Tue, 15 Nov 2022 16:07:19 +1100 Subject: [PATCH] v0.1.3 Bug Fixes --- MMOKitchen/MMOKitchen.csproj | 3 +++ MMOKitchen/Mod.cs | 4 ++-- MMOKitchen/Patches/CreateBedrooms_Patch.cs | 16 +++++++------- MMOKitchen/Patches/CreateGarage_Patch.cs | 1 + MMOKitchen/Patches/LobbyTransaction_Patch.cs | 23 ++++++++++++++++++++ 5 files changed, 37 insertions(+), 10 deletions(-) create mode 100644 MMOKitchen/Patches/LobbyTransaction_Patch.cs diff --git a/MMOKitchen/MMOKitchen.csproj b/MMOKitchen/MMOKitchen.csproj index e34bbe6..0b29987 100644 --- a/MMOKitchen/MMOKitchen.csproj +++ b/MMOKitchen/MMOKitchen.csproj @@ -30,6 +30,9 @@ $(PlateUpGameFolder)\PlateUp_Data\Managed\KitchenMode.dll + + $(PlateUpGameFolder)\PlateUp_Data\Managed\Discord.dll + $(PlateUpGameFolder)\MelonLoader\MelonLoader.dll diff --git a/MMOKitchen/Mod.cs b/MMOKitchen/Mod.cs index 73f5bff..22463a4 100644 --- a/MMOKitchen/Mod.cs +++ b/MMOKitchen/Mod.cs @@ -8,14 +8,14 @@ using MelonLoader; #endif #if MelonLoader -[assembly: MelonInfo(typeof(MMOKitchen.Mod), "MMO Kitchen", "0.1.2", "StarFluxGames")] +[assembly: MelonInfo(typeof(MMOKitchen.Mod), "MMO Kitchen", "0.1.3", "StarFluxGames")] [assembly: MelonGame("It's Happening", "PlateUp")] #endif namespace MMOKitchen { #if BepInEx [BepInProcess("PlateUp.exe")] - [BepInPlugin("starfluxgames.mmokitchen", "MMO Kitchen", "0.1.2")] + [BepInPlugin("starfluxgames.mmokitchen", "MMO Kitchen", "0.1.3")] #endif public class Mod : BaseMod { diff --git a/MMOKitchen/Patches/CreateBedrooms_Patch.cs b/MMOKitchen/Patches/CreateBedrooms_Patch.cs index 876720d..26972ab 100644 --- a/MMOKitchen/Patches/CreateBedrooms_Patch.cs +++ b/MMOKitchen/Patches/CreateBedrooms_Patch.cs @@ -25,14 +25,14 @@ namespace MMOKitchen new Vector3(9f, 0f, 2f), new Vector3(9f, 0f, -3f), new Vector3(9f, 0f, -6f), - new Vector3(13f, 0f, 5f), - new Vector3(13f, 0f, 2f), - new Vector3(13f, 0f, -3f), - new Vector3(13f, 0f, -6f), - new Vector3(-11f, 0f, 5f), - new Vector3(-11f, 0f, 2f), - new Vector3(-11f, 0f, -3f), - new Vector3(-11f, 0f, -6f) + new Vector3(14f, 0f, 5f), + new Vector3(14f, 0f, 2f), + new Vector3(14f, 0f, -3f), + new Vector3(14f, 0f, -6f), + new Vector3(-12f, 0f, 5f), + new Vector3(-12f, 0f, 2f), + new Vector3(-12f, 0f, -3f), + new Vector3(-12f, 0f, -6f) }; for (int i = 0; i < 12; i++) { diff --git a/MMOKitchen/Patches/CreateGarage_Patch.cs b/MMOKitchen/Patches/CreateGarage_Patch.cs index 9501bf9..5aa3e95 100644 --- a/MMOKitchen/Patches/CreateGarage_Patch.cs +++ b/MMOKitchen/Patches/CreateGarage_Patch.cs @@ -27,6 +27,7 @@ namespace MMOKitchen entity = (Entity)create.Invoke(__instance, new object[]{GameData.Main.Get(AssetReference.LoadoutPedestal), new Vector3(-8.5f, 0f, -4f), Vector3.right}); EntityUtils.GetEntityManager().AddComponent(entity); entity = (Entity)create.Invoke(__instance, new object[]{GameData.Main.Get(AssetReference.LoadoutPedestal), new Vector3(-9.5f, 0f, -4f), Vector3.right}); + EntityUtils.GetEntityManager().AddComponent(entity); bool isEmpty = ((EntityQuery)crates.GetValue(__instance)).IsEmpty; if (!isEmpty) { diff --git a/MMOKitchen/Patches/LobbyTransaction_Patch.cs b/MMOKitchen/Patches/LobbyTransaction_Patch.cs new file mode 100644 index 0000000..ff87931 --- /dev/null +++ b/MMOKitchen/Patches/LobbyTransaction_Patch.cs @@ -0,0 +1,23 @@ +using HarmonyLib; +using Discord; +using Kitchen.NetworkSupport; +using System.Collections.Generic; +using System.Reflection.Emit; + +namespace MMOKitchen +{ + [HarmonyPatch(typeof(DiscordPlatform))] + [HarmonyPatch("CreateNewLobby")] + public static class DiscordPlatform_Patch + { + static IEnumerable Transpiler(IEnumerable instructions) + { + var codes = new List(instructions); + for (var i = 0; i < codes.Count; i++) + if (codes[i].opcode == OpCodes.Ldc_I4_4) + codes[i].opcode = OpCodes.Ldc_I4_8; + + return codes; + } + } +} \ No newline at end of file