Skip to content

Commit 54cde4b

Browse files
luvoidluvoid
committed
Swaped UniverseLib for UniverseUGUI and CM3D2.UGUI
1 parent 26aa1d1 commit 54cde4b

7 files changed

Lines changed: 207 additions & 312 deletions

File tree

‎ButtJiggle.sln‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ VisualStudioVersion = 17.3.32922.545
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ButtJiggle", "ButtJiggle\ButtJiggle.csproj", "{21D55085-3997-4A44-B09B-2B1735CA6D2A}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BepInEx.Configuration.Json", "..\BepInEx.Configuration.Json\BepInEx.Configuration.Json\BepInEx.Configuration.Json.csproj", "{FF4B6D69-D118-4506-B65E-DB55555F7F13}"
9-
EndProject
108
Global
119
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1210
Debug|Any CPU = Debug|Any CPU
@@ -17,10 +15,6 @@ Global
1715
{21D55085-3997-4A44-B09B-2B1735CA6D2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
1816
{21D55085-3997-4A44-B09B-2B1735CA6D2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
1917
{21D55085-3997-4A44-B09B-2B1735CA6D2A}.Release|Any CPU.Build.0 = Release|Any CPU
20-
{FF4B6D69-D118-4506-B65E-DB55555F7F13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21-
{FF4B6D69-D118-4506-B65E-DB55555F7F13}.Debug|Any CPU.Build.0 = Debug|Any CPU
22-
{FF4B6D69-D118-4506-B65E-DB55555F7F13}.Release|Any CPU.ActiveCfg = Release|Any CPU
23-
{FF4B6D69-D118-4506-B65E-DB55555F7F13}.Release|Any CPU.Build.0 = Release|Any CPU
2418
EndGlobalSection
2519
GlobalSection(SolutionProperties) = preSolution
2620
HideSolutionNode = FALSE

‎ButtJiggle/ButtJiggle.cs‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@
55
using HarmonyLib;
66
using Newtonsoft.Json;
77
using System;
8-
using System.Collections.Generic;
98
using System.IO;
109
using System.Reflection;
1110
using System.Security;
1211
using System.Security.Permissions;
1312
using UnityEngine;
1413
using UnityEngine.Events;
15-
using static Newtonsoft.Json.JsonToken;
14+
using CM3D2.UGUI;
1615

1716

1817

@@ -51,7 +50,7 @@ public static class PluginInfo
5150
// The name of this plugin.
5251
public const string PLUGIN_NAME = "Butt Jiggle";
5352
// The version of this plugin.
54-
public const string PLUGIN_VERSION = "0.12";
53+
public const string PLUGIN_VERSION = "0.13";
5554
}
5655
}
5756

@@ -135,19 +134,6 @@ void Awake()
135134
Logger.LogDebug("Finished patching");
136135
}
137136

138-
void Start()
139-
{
140-
Universe_Init();
141-
}
142-
143-
void Update()
144-
{
145-
if (UIHotkey.Value.IsDown())
146-
{
147-
ToggleUI();
148-
}
149-
}
150-
151137
private void ConfigBindGlobalOverride()
152138
{
153139
if (GlobalOverride_Enabled != null) return;

‎ButtJiggle/ButtJiggle.csproj‎

Lines changed: 17 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
32
<PropertyGroup>
43
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
54
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
@@ -13,7 +12,7 @@
1312
<RootNamespace>COM3D2.ButtJiggle</RootNamespace>
1413
<AssemblyName>COM3D2.ButtJiggle.Plugin</AssemblyName>
1514
<LangVersion>latest</LangVersion>
16-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
15+
<TargetFramework>net35</TargetFramework>
1716
<FileAlignment>512</FileAlignment>
1817
<COM3D2InstallPath>C:\DJN\KISS\COM3D2</COM3D2InstallPath>
1918
<OutputPath>bin\$(Configuration)\$(Platform)</OutputPath>
@@ -35,15 +34,15 @@
3534
<WarningLevel>4</WarningLevel>
3635
</PropertyGroup>
3736
<PropertyGroup>
38-
<RestoreSources>$(RestoreSources);https://nuget.bepinex.dev/v3/index.json</RestoreSources>
37+
<RestoreSources>$(RestoreSources);https://api.nuget.org/v3/index.json;https://nuget.bepinex.dev/v3/index.json</RestoreSources>
3938
</PropertyGroup>
4039
<ItemGroup>
4140
<PackageReference Include="COM3D2.GameLibs" Version="2.13.0-r.0" targetFramework="net35" />
4241
<PackageReference Include="UnityEngine" Version="5.6.1" targetFramework="net35" />
4342
<PackageReference Include="BepInEx.Analyzers" Version="1.0.8" targetFramework="net35" developmentDependency="true">
4443
<PrivateAssets>all</PrivateAssets>
4544
</PackageReference>
46-
<PackageReference Include="BepInEx.BaseLib" Version="5.4.19" targetFramework="net35" />
45+
<PackageReference Include="BepInEx.BaseLib" Version="5.4.21" targetFramework="net35" />
4746
<PackageReference Include="BepInEx.Core" Version="5.4.19" targetFramework="net35" />
4847
<PackageReference Include="HarmonyX" Version="2.7.0" targetFramework="net35" />
4948
<PackageReference Include="Mono.Cecil" Version="0.10.4" targetFramework="net35" />
@@ -52,7 +51,9 @@
5251
<PackageReference Include="UniverseLib.Analyzers" Version="1.0.4" targetFramework="net35" developmentDependency="true">
5352
<PrivateAssets>all</PrivateAssets>
5453
</PackageReference>
55-
<PackageReference Include="UniverseLib.Mono" Version="1.5.1" targetFramework="net35" />
54+
<PackageReference Include="LuVoid.UniverseUGUI.Mono" Version="1.6.3-preview" targetFramework="net35" />
55+
<PackageReference Include="LuVoid.CM3D2.UGUI" Version="0.1.3-preview" targetFramework="net35" />
56+
<PackageReference Include="LuVoid.BepInEx.Configuration.Json" Version="0.5.0-alpha" targetFramework="net35" />
5657
</ItemGroup>
5758
<ItemGroup>
5859
<Reference Include="System">
@@ -79,38 +80,20 @@
7980
<ReferencePath>$(ReferencePath);$(COM3D2InstallPath)\Sybaris</ReferencePath>
8081
<ReferencePath>$(ReferencePath);$(COM3D2InstallPath)\Sybaris\UnityInjector</ReferencePath>
8182
</PropertyGroup>
82-
<ItemGroup>
83-
<Compile Include="ButtJiggleUI.cs" />
84-
<Compile Include="ConfigurationManagerAttributes.cs" />
85-
<Compile Include="JiggleBoneHelper.cs" />
86-
<Compile Include="BoneMorph_Patch.cs" />
87-
<Compile Include="JiggleBoneOverride.cs" />
88-
<Compile Include="MaidJiggleOverride.cs" />
89-
<Compile Include="Override.cs" />
90-
<Compile Include="Properties\AssemblyInfo.cs" />
91-
<Compile Include="ButtJiggle.cs" />
92-
<Compile Include="UnityRuntimeGizmos.cs" />
93-
<Compile Include="SphereRenderer.cs" />
94-
<Compile Include="Stiffness.cs" />
95-
<Compile Include="TBodyPatch.cs" />
96-
<Compile Include="UIControlFactory.cs" />
97-
</ItemGroup>
98-
<ItemGroup>
99-
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
100-
</ItemGroup>
101-
<ItemGroup>
102-
<ProjectReference Include="..\..\BepInEx.Configuration.Json\BepInEx.Configuration.Json\BepInEx.Configuration.Json.csproj">
103-
<Project>{ff4b6d69-d118-4506-b65e-db55555f7f13}</Project>
104-
<Name>BepInEx.Configuration.Json</Name>
105-
</ProjectReference>
106-
</ItemGroup>
107-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
10883
<PropertyGroup>
10984
<PostBuildEvent>
110-
rd "$(COM3D2InstallPath)\BepinEx\plugins\vsout_$(ProjectName)"
111-
mklink /J "$(COM3D2InstallPath)\BepinEx\plugins\vsout_$(ProjectName)" .
85+
rd "$(COM3D2InstallPath)\BepinEx\plugins\vsout_$(AssemblyName)"
86+
mklink /J "$(COM3D2InstallPath)\BepinEx\plugins\vsout_$(AssemblyName)" .
11287
</PostBuildEvent>
11388
</PropertyGroup>
89+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
90+
<Deterministic>False</Deterministic>
91+
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
92+
</PropertyGroup>
93+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
94+
<Deterministic>False</Deterministic>
95+
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
96+
</PropertyGroup>
11497
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
11598
Other similar extension points exist, see Microsoft.Common.targets.
11699
<Target Name="BeforeBuild">

0 commit comments

Comments
 (0)