fix for 0.6.0 ML and btd6 v34

GrahamKracker · Dec 30, 2022 · 0cf877f · 0cf877f
1 parent 1ff8f52
commit 0cf877f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 28 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,14 +2,13 @@ name: Build
 
 on:
   push:
-    branches:
-      - '*'
+    branches: [ "master" ]
     tags:
       - '*'
 
 env:
   PROJECT_NAME: MoreDegrees
-  MOD_HELPER_BRANCH: master
+  MELONLOADER_BRANCH: alpha-development
 
   MOD_HELPER_NAME: Btd6ModHelper
   BLOONSTD6: ./BloonsTD6
@@ -49,7 +48,7 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           workflow: build.yml
           branch: ${{ env.MELONLOADER_BRANCH }}
-          name: MelonLoader.x64.CI.Release
+          name: MelonLoader.Linux.x64.CI.Release
           repo: LavaGang/MelonLoader
           path: ${{ env.BLOONSTD6 }}
 
@@ -60,12 +59,12 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           repository: doombubbles/btd6-ci-dependencies
           ref: main
-          path: ${{ env.BLOONSTD6 }}/MelonLoader/Managed
+          path: ${{ env.BLOONSTD6 }}/MelonLoader/Il2CppAssemblies
 
 
       - name: Download Latest Mod Helper
         uses: robinraju/release-downloader@v1.4
-        if: env.MOD_HELPER_BRANCH == 'master'
+        if: env.MOD_HELPER_BRANCH == ''
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           repository: gurrenm3/BTD-Mod-Helper
@@ -78,7 +77,7 @@ jobs:
 
       - name: Download Specific Mod Helper
         uses: dawidd6/action-download-artifact@v2
-        if: env.MOD_HELPER_BRANCH != 'master'
+        if: env.MOD_HELPER_BRANCH != ''
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           workflow: build.yml
@@ -94,7 +93,7 @@ jobs:
           if [ "$RUNNER_OS" == "Windows" ]; then
             choco install -y wget
           fi
-          wget https://raw.githubusercontent.com/gurrenm3/BTD-Mod-Helper/${{ env.MOD_HELPER_BRANCH }}/BloonsTD6%20Mod%20Helper/btd6.targets
+          wget https://raw.githubusercontent.com/gurrenm3/BTD-Mod-Helper/master/BloonsTD6%20Mod%20Helper/btd6.targets
 
 
       - name: Setup .NET

diff --git a/Main.cs b/Main.cs
@@ -1,4 +1,12 @@
-using MelonLoader;
+using Il2CppAssets.Scripts.Models;
+using Il2CppAssets.Scripts.Models.Towers;
+using Il2CppAssets.Scripts.Models.Towers.Behaviors;
+using Il2CppAssets.Scripts.Models.Towers.Projectiles;
+using Il2CppAssets.Scripts.Models.Towers.Projectiles.Behaviors;
+using Il2CppAssets.Scripts.Simulation.Towers;
+using Il2CppAssets.Scripts.Unity.UI_New.InGame;
+using Il2CppAssets.Scripts.Unity.UI_New.InGame.AbilitiesMenu;
+using MelonLoader;
 using MoreDegrees;
 using Main = MoreDegrees.Main;
 
@@ -8,14 +16,6 @@
 namespace MoreDegrees;
 
 using System;
-using Assets.Scripts.Models;
-using Assets.Scripts.Models.Towers;
-using Assets.Scripts.Models.Towers.Behaviors;
-using Assets.Scripts.Models.Towers.Projectiles;
-using Assets.Scripts.Models.Towers.Projectiles.Behaviors;
-using Assets.Scripts.Simulation.Towers;
-using Assets.Scripts.Unity.UI_New.InGame;
-using Assets.Scripts.Unity.UI_New.InGame.AbilitiesMenu;
 using BTD_Mod_Helper;
 using BTD_Mod_Helper.Api.Enums;
 using BTD_Mod_Helper.Api.ModOptions;

diff --git a/ModHelperData.cs b/ModHelperData.cs
@@ -1,10 +1,11 @@
 namespace MoreDegrees;
 
 public static class ModHelperData
-{
+{      
+    public const string WorksOnVersion = "34.3";
     public const string Name = "MoreDegrees";
     public const string Description = "Adds infinite paragon degrees. The coefficients used in the equation to determine the amount of sacrifices needed per degree are able to be changed in mod settings. Modded paragons should be compatible. Engineer paragon sentries are currently unaffected by degrees above 100. The max degree paragons can be set to is able to be changed in settings. Insanely high degrees cause damage to become negative, this is a flaw within btd6 that I can't fix.";
-    public const string Version = "1.0.0";
+    public const string Version = "1.1.0";
     public const string RepoOwner = "GrahamKraker";
     public const string RepoName = "MoreDegrees";
 }
diff --git a/MoreDegrees.csproj b/MoreDegrees.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net48</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>MoreDegrees</RootNamespace>
         <Configurations>Debug;Release</Configurations>
         <Nullable>enable</Nullable>
@@ -19,14 +19,6 @@
     <ItemGroup>
         <None Include=".github\workflows\build.yml" />
     </ItemGroup>
-    <ItemGroup>
-        <Reference Include="0Harmony">
-            <HintPath>c:\Program Files (x86)\Steam\steamapps\common\BloonsTD6\MelonLoader\net35\0Harmony.dll</HintPath>
-        </Reference>
-        <Reference Include="MelonLoader">
-            <HintPath>C:\Program Files (x86)\Steam\steamapps\common\BloonsTD6\MelonLoader\net35\MelonLoader.dll</HintPath>
-        </Reference>
-    </ItemGroup>
     <Import Condition="Exists('..\..\btd6.targets')" Project="..\..\btd6.targets"/>
     <Import Condition="!Exists('..\..\btd6.targets')" Project="..\btd6.targets"/>
 </Project>