From 44faaa4724907f767980ea7e61412e3a8273f30f Mon Sep 17 00:00:00 2001 From: Averixus Date: Tue, 12 May 2026 17:52:45 +0100 Subject: [PATCH] Reconciling broken commit history --- .gitignore | 324 ++++++++- .vscode/extensions.json | 6 + .vscode/launch.json | 67 ++ .vscode/tasks.json | 40 ++ .../CakeBuild.csproj | 7 +- CakeBuild/Program.cs | 119 +++ LICENSE | 3 +- README.md | 4 +- Substrate.sln | 27 +- Substrate/.gitignore | 675 ------------------ .../Behaviors/BehaviorMushroomGrower.cs | 0 .../Behaviors/BehaviorShapeInventory.cs | 7 +- .../BlockEntities/BlockEntityFruitingBag.cs | 0 .../BlockEntities/BlockEntitySporePaper.cs | 12 +- .../Blocks/BlockFruitingBag.cs | 0 .../{Substrate => }/Blocks/BlockGrowBed.cs | 0 .../{Substrate => }/Blocks/BlockSporePaper.cs | 0 .../Patches/BlockPlantPatches.cs | 7 +- .../Properties/launchSettings.json | 0 Substrate/Substrate.csproj | 49 ++ Substrate/Substrate.sln | 28 - Substrate/Substrate/Substrate.csproj | 80 --- Substrate/Substrate/modinfo.json | 13 - .../{Substrate => }/SubstrateModSystem.cs | 0 .../Utils/CodecPattern/Builders.cs | 0 .../Utils/CodecPattern/Codec.cs | 0 .../CodecPattern/Codecs/AttributeCodec.cs | 0 .../CodecPattern/Codecs/ItemStackCodec.cs | 0 .../Utils/CodecPattern/Extensions.cs | 0 .../{Substrate => }/Utils/Collectibles.cs | 0 .../{Substrate => }/Utils/ExtensionMethods.cs | 0 Substrate/ZZCakeBuild/Program.cs | 120 ---- .../substrate/blocktypes/fruitingbag.json | 0 .../assets/substrate/blocktypes/growbed.json | 10 +- .../substrate/blocktypes/sporepaper.json | 0 .../blocktypes/sporepaperprinted.json | 10 +- .../assets/substrate/itemtypes/sawdust.json | 1 + .../substrate/itemtypes/sporeprint.json | 10 +- .../substrate/itemtypes/wetsporepaper.json | 0 .../assets/substrate/itemtypes/woodchip.json | 1 + .../assets/substrate/lang/en.json | 28 +- .../assets/substrate/patches/mushroom.json | 0 .../recipes/barrel/wetsporepaper.json | 0 .../substrate/recipes/grid/fruitingbag.json | 5 +- .../substrate/recipes/grid/growbed.json | 5 +- .../substrate/recipes/grid/sporeprint.json | 0 .../substrate/recipes/grid/woodchip.json | 1 + .../substrate/shapes/block/fruitingbag.json | 0 .../substrate/shapes/block/growbed.json | 0 .../textures/block/fruitingbag-depleted.png | Bin .../textures/block/growbed/soil-substrate.png | Bin .../substrate/textures/block/growbed/wood.png | Bin .../textures/block/sporepaper-blank.png | Bin .../textures/block/sporepaper-printed.png | Bin .../substrate/textures/item/sawdust.png | Bin .../substrate/textures/item/sporeprint.png | Bin .../substrate/textures/item/wetsporepaper.png | Bin Substrate/build.ps1 | 2 - Substrate/build.sh | 1 - Substrate/modicon.png | Bin 0 -> 24492 bytes Substrate/modinfo.json | 13 + build.ps1 | 2 + build.sh | 1 + 63 files changed, 710 insertions(+), 968 deletions(-) create mode 100644 .vscode/extensions.json create mode 100644 .vscode/launch.json create mode 100644 .vscode/tasks.json rename {Substrate/ZZCakeBuild => CakeBuild}/CakeBuild.csproj (63%) create mode 100644 CakeBuild/Program.cs delete mode 100644 Substrate/.gitignore rename Substrate/{Substrate => }/Behaviors/BehaviorMushroomGrower.cs (100%) rename Substrate/{Substrate => }/Behaviors/BehaviorShapeInventory.cs (84%) rename Substrate/{Substrate => }/BlockEntities/BlockEntityFruitingBag.cs (100%) rename Substrate/{Substrate => }/BlockEntities/BlockEntitySporePaper.cs (93%) rename Substrate/{Substrate => }/Blocks/BlockFruitingBag.cs (100%) rename Substrate/{Substrate => }/Blocks/BlockGrowBed.cs (100%) rename Substrate/{Substrate => }/Blocks/BlockSporePaper.cs (100%) rename Substrate/{Substrate => }/Patches/BlockPlantPatches.cs (72%) rename Substrate/{Substrate => }/Properties/launchSettings.json (100%) create mode 100644 Substrate/Substrate.csproj delete mode 100644 Substrate/Substrate.sln delete mode 100644 Substrate/Substrate/Substrate.csproj delete mode 100644 Substrate/Substrate/modinfo.json rename Substrate/{Substrate => }/SubstrateModSystem.cs (100%) rename Substrate/{Substrate => }/Utils/CodecPattern/Builders.cs (100%) rename Substrate/{Substrate => }/Utils/CodecPattern/Codec.cs (100%) rename Substrate/{Substrate => }/Utils/CodecPattern/Codecs/AttributeCodec.cs (100%) rename Substrate/{Substrate => }/Utils/CodecPattern/Codecs/ItemStackCodec.cs (100%) rename Substrate/{Substrate => }/Utils/CodecPattern/Extensions.cs (100%) rename Substrate/{Substrate => }/Utils/Collectibles.cs (100%) rename Substrate/{Substrate => }/Utils/ExtensionMethods.cs (100%) delete mode 100644 Substrate/ZZCakeBuild/Program.cs rename Substrate/{Substrate => }/assets/substrate/blocktypes/fruitingbag.json (100%) rename Substrate/{Substrate => }/assets/substrate/blocktypes/growbed.json (92%) rename Substrate/{Substrate => }/assets/substrate/blocktypes/sporepaper.json (100%) rename Substrate/{Substrate => }/assets/substrate/blocktypes/sporepaperprinted.json (93%) rename Substrate/{Substrate => }/assets/substrate/itemtypes/sawdust.json (98%) rename Substrate/{Substrate => }/assets/substrate/itemtypes/sporeprint.json (94%) rename Substrate/{Substrate => }/assets/substrate/itemtypes/wetsporepaper.json (100%) rename Substrate/{Substrate => }/assets/substrate/itemtypes/woodchip.json (98%) rename Substrate/{Substrate => }/assets/substrate/lang/en.json (85%) rename Substrate/{Substrate => }/assets/substrate/patches/mushroom.json (100%) rename Substrate/{Substrate => }/assets/substrate/recipes/barrel/wetsporepaper.json (100%) rename Substrate/{Substrate => }/assets/substrate/recipes/grid/fruitingbag.json (83%) rename Substrate/{Substrate => }/assets/substrate/recipes/grid/growbed.json (85%) rename Substrate/{Substrate => }/assets/substrate/recipes/grid/sporeprint.json (100%) rename Substrate/{Substrate => }/assets/substrate/recipes/grid/woodchip.json (93%) rename Substrate/{Substrate => }/assets/substrate/shapes/block/fruitingbag.json (100%) rename Substrate/{Substrate => }/assets/substrate/shapes/block/growbed.json (100%) rename Substrate/{Substrate => }/assets/substrate/textures/block/fruitingbag-depleted.png (100%) rename Substrate/{Substrate => }/assets/substrate/textures/block/growbed/soil-substrate.png (100%) rename Substrate/{Substrate => }/assets/substrate/textures/block/growbed/wood.png (100%) rename Substrate/{Substrate => }/assets/substrate/textures/block/sporepaper-blank.png (100%) rename Substrate/{Substrate => }/assets/substrate/textures/block/sporepaper-printed.png (100%) rename Substrate/{Substrate => }/assets/substrate/textures/item/sawdust.png (100%) rename Substrate/{Substrate => }/assets/substrate/textures/item/sporeprint.png (100%) rename Substrate/{Substrate => }/assets/substrate/textures/item/wetsporepaper.png (100%) delete mode 100644 Substrate/build.ps1 delete mode 100644 Substrate/build.sh create mode 100644 Substrate/modicon.png create mode 100644 Substrate/modinfo.json create mode 100644 build.ps1 create mode 100644 build.sh diff --git a/.gitignore b/.gitignore index 9491a2f..4de708b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,17 @@ +# Created by https://www.toptal.com/developers/gitignore/api/csharp,visualstudio,visualstudiocode,rider +# Edit at https://www.toptal.com/developers/gitignore?templates=csharp,visualstudio,visualstudiocode,rider + +### Csharp ### ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. ## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore +## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore + +# macos +.DS_Store + +# my notes +TODO.txt # User-specific files *.rsuser @@ -29,7 +39,6 @@ x86/ bld/ [Bb]in/ [Oo]bj/ -[Oo]ut/ [Ll]og/ [Ll]ogs/ @@ -91,6 +100,7 @@ StyleCopReport.xml *.tmp_proj *_wpftmp.csproj *.log +*.tlog *.vspscc *.vssscc .builds @@ -294,6 +304,15 @@ node_modules/ # Visual Studio 6 auto-generated workspace file (contains which files were open etc.) *.vbw +# Visual Studio 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files + # Visual Studio LightSwitch build output **/*.HTMLClient/GeneratedArtifacts **/*.DesktopClient/GeneratedArtifacts @@ -350,6 +369,9 @@ ASALocalRun/ # Local History for Visual Studio .localhistory/ +# Visual Studio History (VSHistory) files +.vshistory/ + # BeatPulse healthcheck temp database healthchecksdb @@ -360,4 +382,300 @@ MigrationBackup/ .ionide/ # Fody - auto-generated XML schema -FodyWeavers.xsd \ No newline at end of file +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +*.sln.iml + +### Rider ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### VisualStudioCode ### +!.vscode/*.code-snippets + +# Local History for Visual Studio Code + +# Built Visual Studio Code Extensions +*.vsix + +### VisualStudioCode Patch ### +# Ignore all local history of files +.history +.ionide + +### VisualStudio ### + +# User-specific files + +# User-specific files (MonoDevelop/Xamarin Studio) + +# Mono auto generated files + +# Build results + +# Visual Studio 2015/2017 cache/options directory +# Uncomment if you have tasks that create the project's static files in wwwroot + +# Visual Studio 2017 auto generated files + +# MSTest test Results + +# NUnit + +# Build Results of an ATL Project + +# Benchmark Results + +# .NET Core + +# ASP.NET Scaffolding + +# StyleCop + +# Files built by Visual Studio + +# Chutzpah Test files + +# Visual C++ cache files + +# Visual Studio profiler + +# Visual Studio Trace Files + +# TFS 2012 Local Workspace + +# Guidance Automation Toolkit + +# ReSharper is a .NET coding add-in + +# TeamCity is a build add-in + +# DotCover is a Code Coverage Tool + +# AxoCover is a Code Coverage Tool + +# Coverlet is a free, cross platform Code Coverage Tool + +# Visual Studio code coverage results + +# NCrunch + +# MightyMoose + +# Web workbench (sass) + +# Installshield output folder + +# DocProject is a documentation generator add-in + +# Click-Once directory + +# Publish Web Output +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted + +# NuGet Packages +# NuGet Symbol Packages +# The packages folder can be ignored because of Package Restore +# except build/, which is used as an MSBuild target. +# Uncomment if necessary however generally it will be regenerated when needed +# NuGet v3's project.json files produces more ignorable files + +# Microsoft Azure Build Output + +# Microsoft Azure Emulator + +# Windows Store app package directories and files + +# Visual Studio cache files +# files ending in .cache can be ignored +# but keep track of directories ending in .cache + +# Others + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) + +# RIA/Silverlight projects + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) + +# SQL Server files + +# Business Intelligence projects + +# Microsoft Fakes + +# GhostDoc plugin setting file + +# Node.js Tools for Visual Studio + +# Visual Studio 6 build log + +# Visual Studio 6 workspace options file + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) + +# Visual Studio 6 auto-generated project file (contains which files were open etc.) + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) + +# Visual Studio 6 technical files + +# Visual Studio LightSwitch build output + +# Paket dependency manager + +# FAKE - F# Make + +# CodeRush personal settings + +# Python Tools for Visual Studio (PTVS) + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio + +# Telerik's JustMock configuration file + +# BizTalk build output + +# OpenCover UI analysis results + +# Azure Stream Analytics local run output + +# MSBuild Binary and Structured Log + +# NVidia Nsight GPU debugger configuration file + +# MFractors (Xamarin productivity tool) working folder + +# Local History for Visual Studio + +# Visual Studio History (VSHistory) files + +# BeatPulse healthcheck temp database + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 + +# Ionide (cross platform F# VS Code tools) working folder + +# Fody - auto-generated XML schema + +# VS Code files for those working on multiple tools + +# Local History for Visual Studio Code + +# Windows Installer files from build outputs + +# JetBrains Rider + +### VisualStudio Patch ### +# Additional files built by Visual Studio + +# End of https://www.toptal.com/developers/gitignore/api/csharp,visualstudio,visualstudiocode,rider \ No newline at end of file diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..7898877 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,6 @@ +{ + "recommendations": [ + "ms-dotnettools.csdevkit", + "ms-dotnettools.csharp" + ] +} \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..d0d99ad --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,67 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "Launch Client (Debug)", + "type": "coreclr", + "request": "launch", + "program": "/usr/local/share/dotnet/x64/dotnet", + "linux": { + "program": "${env:VINTAGE_STORY}/Vintagestory" + }, + "osx": { + "program": "${env:VINTAGE_STORY}/Vintagestory" + }, + "preLaunchTask": "build", + "args": [ + // "--playStyle" , "preset-surviveandbuild", + // "--openWorld" , "modding test world", + "${env:VINTAGE_STORY}/Vintagestory.dll", + "--tracelog", + "--addModPath", + "${workspaceFolder}/Substrate/bin/Debug/Mods", + "--addOrigin", + "${workspaceFolder}/Substrate/assets" + ], + "targetArchitecture": "x86_64", + "console": "internalConsole", + "stopAtEntry": false + }, + { + "name": "Launch Server", + "type": "coreclr", + "request": "launch", + "program": "${env:VINTAGE_STORY}/VintagestoryServer.exe", + "linux": { + "program": "${env:VINTAGE_STORY}/VintagestoryServer" + }, + "osx": { + "program": "${env:VINTAGE_STORY}/VintagestoryServer" + }, + "preLaunchTask": "build", + "args": [ + "--tracelog", + "--addModPath", + "${workspaceFolder}/Substrate/bin/Debug/Mods", + "--addOrigin", + "${workspaceFolder}/Substrate/assets" + ], + "console": "internalConsole", + "stopAtEntry": false + }, + { + "name": "CakeBuild", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build (Cake)", + "program": "${workspaceFolder}/CakeBuild/bin/Debug/CakeBuild.dll", + "args": [], + "cwd": "${workspaceFolder}/CakeBuild", + "stopAtEntry": false, + "console": "internalConsole" + } + ] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..3ad53af --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,40 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "build", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "-c", + "Debug", + "${workspaceFolder}/Substrate/Substrate.csproj" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "package", + "command": "dotnet", + "type": "process", + "args": [ + "run", + "--project", + "${workspaceFolder}/CakeBuild/CakeBuild.csproj" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "build (Cake)", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "-c", + "Debug", + "${workspaceFolder}/CakeBuild/CakeBuild.csproj" + ], + "problemMatcher": "$msCompile" + } + ] +} \ No newline at end of file diff --git a/Substrate/ZZCakeBuild/CakeBuild.csproj b/CakeBuild/CakeBuild.csproj similarity index 63% rename from Substrate/ZZCakeBuild/CakeBuild.csproj rename to CakeBuild/CakeBuild.csproj index 8e2c970..e0038af 100644 --- a/Substrate/ZZCakeBuild/CakeBuild.csproj +++ b/CakeBuild/CakeBuild.csproj @@ -1,14 +1,15 @@ Exe - net7.0 + net10.0 $(MSBuildProjectDirectory) + false - + - + diff --git a/CakeBuild/Program.cs b/CakeBuild/Program.cs new file mode 100644 index 0000000..6f6b372 --- /dev/null +++ b/CakeBuild/Program.cs @@ -0,0 +1,119 @@ +using System; +using System.IO; +using Cake.Common; +using Cake.Common.IO; +using Cake.Common.Tools.DotNet; +using Cake.Common.Tools.DotNet.Clean; +using Cake.Common.Tools.DotNet.Publish; +using Cake.Core; +using Cake.Frosting; +using Cake.Json; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using Vintagestory.API.Common; + +namespace CakeBuild; + +public static class Program +{ + public static int Main(string[] args) + { + return new CakeHost() + .UseContext() + .Run(args); + } +} + +public class BuildContext : FrostingContext +{ + public const string ProjectName = "Substrate"; + public string BuildConfiguration { get; } + public string Version { get; } + public string Name { get; } + public bool SkipJsonValidation { get; } + + public BuildContext(ICakeContext context) + : base(context) + { + BuildConfiguration = context.Argument("configuration", "Release"); + SkipJsonValidation = context.Argument("skipJsonValidation", false); + var modInfo = context.DeserializeJsonFromFile($"../{ProjectName}/modinfo.json"); + Version = modInfo.Version; + Name = modInfo.ModID; + } +} + +[TaskName("ValidateJson")] +public sealed class ValidateJsonTask : FrostingTask +{ + public override void Run(BuildContext context) + { + if (context.SkipJsonValidation) + { + return; + } + var jsonFiles = context.GetFiles($"../{BuildContext.ProjectName}/assets/**/*.json"); + foreach (var file in jsonFiles) + { + try + { + var json = File.ReadAllText(file.FullPath); + JToken.Parse(json); + } + catch (JsonException ex) + { + throw new Exception($"Validation failed for JSON file: {file.FullPath}{Environment.NewLine}{ex.Message}", ex); + } + } + } +} + +[TaskName("Build")] +[IsDependentOn(typeof(ValidateJsonTask))] +public sealed class BuildTask : FrostingTask +{ + public override void Run(BuildContext context) + { + context.DotNetClean($"../{BuildContext.ProjectName}/{BuildContext.ProjectName}.csproj", + new DotNetCleanSettings + { + Configuration = context.BuildConfiguration + }); + + + context.DotNetPublish($"../{BuildContext.ProjectName}/{BuildContext.ProjectName}.csproj", + new DotNetPublishSettings + { + Configuration = context.BuildConfiguration + }); + } +} + +[TaskName("Package")] +[IsDependentOn(typeof(BuildTask))] +public sealed class PackageTask : FrostingTask +{ + public override void Run(BuildContext context) + { + context.EnsureDirectoryExists("../Releases"); + context.CleanDirectory("../Releases"); + context.EnsureDirectoryExists($"../Releases/{context.Name}"); + context.CopyFiles($"../{BuildContext.ProjectName}/bin/{context.BuildConfiguration}/Mods/mod/publish/*", $"../Releases/{context.Name}"); + if (context.DirectoryExists($"../{BuildContext.ProjectName}/assets")) + { + context.CopyDirectory($"../{BuildContext.ProjectName}/assets", $"../Releases/{context.Name}/assets"); + } + context.CopyFile($"../{BuildContext.ProjectName}/modinfo.json", $"../Releases/{context.Name}/modinfo.json"); + if (context.FileExists($"../{BuildContext.ProjectName}/modicon.png")) + { + context.CopyFile($"../{BuildContext.ProjectName}/modicon.png", $"../Releases/{context.Name}/modicon.png"); + } + context.Zip($"../Releases/{context.Name}", $"../Releases/{context.Name}_{context.Version}.zip"); + } +} + +[TaskName("Default")] +[IsDependentOn(typeof(PackageTask))] +public class DefaultTask : FrostingTask +{ +} \ No newline at end of file diff --git a/LICENSE b/LICENSE index 06cf2f4..118cc81 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ MIT License Copyright (c) 2025 Reid Willis +and Copyright (c) 2026 Avery Rowe Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -18,4 +19,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md index 4ef8b1f..a8a1f99 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Substrate -A Mushroom Cultivation Mod for Vintage Story +A Mushroom Cultivation Mod for Vintage Story. Details and releases: https://mods.vintagestory.at/substrate ## Features @@ -53,4 +53,4 @@ A Mushroom Cultivation Mod for Vintage Story ## Credits -Special thanks to the Vintage Story modding community for inspiration and feedback! +Originally written by Reid Willis (Queerty / Willis 81808). Updated for Vintage Story 1.22 by Avery Rowe (Averixus). Special thanks to the Vintage Story modding community for inspiration and feedback! diff --git a/Substrate.sln b/Substrate.sln index 1039da1..833330d 100644 --- a/Substrate.sln +++ b/Substrate.sln @@ -1,31 +1,28 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 -VisualStudioVersion = 17.11.35327.3 +VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Substrate", "Substrate\Substrate\Substrate.csproj", "{396B7E16-24A9-473B-87EE-3A0EF7BEC55B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Substrate", "Substrate\Substrate.csproj", "{CB2100BC-F653-402A-9FBA-EA463C2BD4FC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CakeBuild", "Substrate\ZZCakeBuild\CakeBuild.csproj", "{9974FE97-6872-4BD8-9AA1-56700C40CD55}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CakeBuild", "CakeBuild\CakeBuild.csproj", "{BC68EDF6-C294-4819-B7F4-9EA99B73E69D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {396B7E16-24A9-473B-87EE-3A0EF7BEC55B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {396B7E16-24A9-473B-87EE-3A0EF7BEC55B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {396B7E16-24A9-473B-87EE-3A0EF7BEC55B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {396B7E16-24A9-473B-87EE-3A0EF7BEC55B}.Release|Any CPU.Build.0 = Release|Any CPU - {9974FE97-6872-4BD8-9AA1-56700C40CD55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9974FE97-6872-4BD8-9AA1-56700C40CD55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9974FE97-6872-4BD8-9AA1-56700C40CD55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9974FE97-6872-4BD8-9AA1-56700C40CD55}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {96853782-562D-481C-A518-7C4C4025E024} + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {BC68EDF6-C294-4819-B7F4-9EA99B73E69D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BC68EDF6-C294-4819-B7F4-9EA99B73E69D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BC68EDF6-C294-4819-B7F4-9EA99B73E69D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BC68EDF6-C294-4819-B7F4-9EA99B73E69D}.Release|Any CPU.Build.0 = Release|Any CPU + {CB2100BC-F653-402A-9FBA-EA463C2BD4FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CB2100BC-F653-402A-9FBA-EA463C2BD4FC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CB2100BC-F653-402A-9FBA-EA463C2BD4FC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CB2100BC-F653-402A-9FBA-EA463C2BD4FC}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection EndGlobal diff --git a/Substrate/.gitignore b/Substrate/.gitignore deleted file mode 100644 index 8e4f89c..0000000 --- a/Substrate/.gitignore +++ /dev/null @@ -1,675 +0,0 @@ -# Created by https://www.toptal.com/developers/gitignore/api/csharp,visualstudio,visualstudiocode,rider -# Edit at https://www.toptal.com/developers/gitignore?templates=csharp,visualstudio,visualstudiocode,rider - -### Csharp ### -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore - -# User-specific files -*.rsuser -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Mono auto generated files -mono_crash.* - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -[Ww][Ii][Nn]32/ -[Aa][Rr][Mm]/ -[Aa][Rr][Mm]64/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ -[Ll]ogs/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUnit -*.VisualState.xml -TestResult.xml -nunit-*.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# ASP.NET Scaffolding -ScaffoldingReadMe.txt - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_h.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*_wpftmp.csproj -*.log -*.tlog -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Coverlet is a free, cross platform Code Coverage Tool -coverage*.json -coverage*.xml -coverage*.info - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# NuGet Symbol Packages -*.snupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx -*.appxbundle -*.appxupload - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!?*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser -*- [Bb]ackup.rdl -*- [Bb]ackup ([0-9]).rdl -*- [Bb]ackup ([0-9][0-9]).rdl - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio 6 auto-generated project file (contains which files were open etc.) -*.vbp - -# Visual Studio 6 workspace and project file (working project files containing files to include in project) -*.dsw -*.dsp - -# Visual Studio 6 technical files - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# CodeRush personal settings -.cr/personal - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - -# Visual Studio History (VSHistory) files -.vshistory/ - -# BeatPulse healthcheck temp database -healthchecksdb - -# Backup folder for Package Reference Convert tool in Visual Studio 2017 -MigrationBackup/ - -# Ionide (cross platform F# VS Code tools) working folder -.ionide/ - -# Fody - auto-generated XML schema -FodyWeavers.xsd - -# VS Code files for those working on multiple tools -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json -*.code-workspace - -# Local History for Visual Studio Code -.history/ - -# Windows Installer files from build outputs -*.cab -*.msi -*.msix -*.msm -*.msp - -# JetBrains Rider -*.sln.iml - -### Rider ### -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 - -# User-specific stuff -.idea/**/workspace.xml -.idea/**/tasks.xml -.idea/**/usage.statistics.xml -.idea/**/dictionaries -.idea/**/shelf - -# AWS User-specific -.idea/**/aws.xml - -# Generated files -.idea/**/contentModel.xml - -# Sensitive or high-churn files -.idea/**/dataSources/ -.idea/**/dataSources.ids -.idea/**/dataSources.local.xml -.idea/**/sqlDataSources.xml -.idea/**/dynamic.xml -.idea/**/uiDesigner.xml -.idea/**/dbnavigator.xml - -# Gradle -.idea/**/gradle.xml -.idea/**/libraries - -# Gradle and Maven with auto-import -# When using Gradle or Maven with auto-import, you should exclude module files, -# since they will be recreated, and may cause churn. Uncomment if using -# auto-import. -# .idea/artifacts -# .idea/compiler.xml -# .idea/jarRepositories.xml -# .idea/modules.xml -# .idea/*.iml -# .idea/modules -# *.iml -# *.ipr - -# CMake -cmake-build-*/ - -# Mongo Explorer plugin -.idea/**/mongoSettings.xml - -# File-based project format -*.iws - -# IntelliJ -out/ - -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Cursive Clojure plugin -.idea/replstate.xml - -# SonarLint plugin -.idea/sonarlint/ - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties - -# Editor-based Rest Client -.idea/httpRequests - -# Android studio 3.1+ serialized cache file -.idea/caches/build_file_checksums.ser - -### VisualStudioCode ### -!.vscode/*.code-snippets - -# Local History for Visual Studio Code - -# Built Visual Studio Code Extensions -*.vsix - -### VisualStudioCode Patch ### -# Ignore all local history of files -.history -.ionide - -### VisualStudio ### - -# User-specific files - -# User-specific files (MonoDevelop/Xamarin Studio) - -# Mono auto generated files - -# Build results - -# Visual Studio 2015/2017 cache/options directory -# Uncomment if you have tasks that create the project's static files in wwwroot - -# Visual Studio 2017 auto generated files - -# MSTest test Results - -# NUnit - -# Build Results of an ATL Project - -# Benchmark Results - -# .NET Core - -# ASP.NET Scaffolding - -# StyleCop - -# Files built by Visual Studio - -# Chutzpah Test files - -# Visual C++ cache files - -# Visual Studio profiler - -# Visual Studio Trace Files - -# TFS 2012 Local Workspace - -# Guidance Automation Toolkit - -# ReSharper is a .NET coding add-in - -# TeamCity is a build add-in - -# DotCover is a Code Coverage Tool - -# AxoCover is a Code Coverage Tool - -# Coverlet is a free, cross platform Code Coverage Tool - -# Visual Studio code coverage results - -# NCrunch - -# MightyMoose - -# Web workbench (sass) - -# Installshield output folder - -# DocProject is a documentation generator add-in - -# Click-Once directory - -# Publish Web Output -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted - -# NuGet Packages -# NuGet Symbol Packages -# The packages folder can be ignored because of Package Restore -# except build/, which is used as an MSBuild target. -# Uncomment if necessary however generally it will be regenerated when needed -# NuGet v3's project.json files produces more ignorable files - -# Microsoft Azure Build Output - -# Microsoft Azure Emulator - -# Windows Store app package directories and files - -# Visual Studio cache files -# files ending in .cache can be ignored -# but keep track of directories ending in .cache - -# Others - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) - -# RIA/Silverlight projects - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) - -# SQL Server files - -# Business Intelligence projects - -# Microsoft Fakes - -# GhostDoc plugin setting file - -# Node.js Tools for Visual Studio - -# Visual Studio 6 build log - -# Visual Studio 6 workspace options file - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) - -# Visual Studio 6 auto-generated project file (contains which files were open etc.) - -# Visual Studio 6 workspace and project file (working project files containing files to include in project) - -# Visual Studio 6 technical files - -# Visual Studio LightSwitch build output - -# Paket dependency manager - -# FAKE - F# Make - -# CodeRush personal settings - -# Python Tools for Visual Studio (PTVS) - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio - -# Telerik's JustMock configuration file - -# BizTalk build output - -# OpenCover UI analysis results - -# Azure Stream Analytics local run output - -# MSBuild Binary and Structured Log - -# NVidia Nsight GPU debugger configuration file - -# MFractors (Xamarin productivity tool) working folder - -# Local History for Visual Studio - -# Visual Studio History (VSHistory) files - -# BeatPulse healthcheck temp database - -# Backup folder for Package Reference Convert tool in Visual Studio 2017 - -# Ionide (cross platform F# VS Code tools) working folder - -# Fody - auto-generated XML schema - -# VS Code files for those working on multiple tools - -# Local History for Visual Studio Code - -# Windows Installer files from build outputs - -# JetBrains Rider - -### VisualStudio Patch ### -# Additional files built by Visual Studio - -# End of https://www.toptal.com/developers/gitignore/api/csharp,visualstudio,visualstudiocode,rider \ No newline at end of file diff --git a/Substrate/Substrate/Behaviors/BehaviorMushroomGrower.cs b/Substrate/Behaviors/BehaviorMushroomGrower.cs similarity index 100% rename from Substrate/Substrate/Behaviors/BehaviorMushroomGrower.cs rename to Substrate/Behaviors/BehaviorMushroomGrower.cs diff --git a/Substrate/Substrate/Behaviors/BehaviorShapeInventory.cs b/Substrate/Behaviors/BehaviorShapeInventory.cs similarity index 84% rename from Substrate/Substrate/Behaviors/BehaviorShapeInventory.cs rename to Substrate/Behaviors/BehaviorShapeInventory.cs index e5151bd..cc5f36a 100644 --- a/Substrate/Substrate/Behaviors/BehaviorShapeInventory.cs +++ b/Substrate/Behaviors/BehaviorShapeInventory.cs @@ -22,10 +22,11 @@ public override void OnLoaded(ICoreAPI api) this._api = api; } - public MeshData GenMesh(ItemStack itemstack, ITextureAtlasAPI targetAtlas, BlockPos atBlockPos) + public MeshData GenMesh(ItemSlot itemslot, ITextureAtlasAPI targetAtlas, BlockPos atBlockPos) { var api = _api as ICoreClientAPI; + ItemStack itemstack = itemslot.Itemstack; var inventoryShape = itemstack.Block.ShapeInventory; // this is not a valid cast var shapePath = inventoryShape.Base.Clone().WithPathAppendixOnce(".json").WithPathPrefixOnce("shapes/"); var shape = _api.Assets.TryGet(shapePath)?.ToObject(); @@ -44,9 +45,9 @@ public MeshData GenMesh(ItemStack itemstack, ITextureAtlasAPI targetAtlas, Block return meshData; } - public string GetMeshCacheKey(ItemStack itemstack) + public string GetMeshCacheKey(ItemSlot slot) { - return itemstack.Collectible.Code + "-shapeInventory"; + return slot.Itemstack.Collectible.Code + "-shapeInventory"; } } } diff --git a/Substrate/Substrate/BlockEntities/BlockEntityFruitingBag.cs b/Substrate/BlockEntities/BlockEntityFruitingBag.cs similarity index 100% rename from Substrate/Substrate/BlockEntities/BlockEntityFruitingBag.cs rename to Substrate/BlockEntities/BlockEntityFruitingBag.cs diff --git a/Substrate/Substrate/BlockEntities/BlockEntitySporePaper.cs b/Substrate/BlockEntities/BlockEntitySporePaper.cs similarity index 93% rename from Substrate/Substrate/BlockEntities/BlockEntitySporePaper.cs rename to Substrate/BlockEntities/BlockEntitySporePaper.cs index e406f47..d8de3d5 100644 --- a/Substrate/Substrate/BlockEntities/BlockEntitySporePaper.cs +++ b/Substrate/BlockEntities/BlockEntitySporePaper.cs @@ -155,8 +155,8 @@ internal bool OnInteract(IPlayer byPlayer, BlockSelection blockSel) if (colObj == null || !CanAccept(colObj) || !TryPut(slot, blockSel)) return false; - var sound = slot.Itemstack?.Block?.Sounds?.Place; - Api.World.PlaySoundAt(sound != null ? sound : new AssetLocation("sounds/player/build"), byPlayer.Entity, byPlayer, true, 16); + SoundAttributes sound = slot.Itemstack?.Block?.Sounds?.Place ?? new SoundAttributes(new AssetLocation("sounds/player/build"), true); + Api.World.PlaySoundAt(sound, byPlayer, byPlayer, 0.5f); return true; } @@ -195,8 +195,8 @@ private bool TryTake(IPlayer byPlayer, BlockSelection blockSel) var stack = inventory.FirstNonEmptySlot?.TakeOut(1); if (stack != null && byPlayer.InventoryManager.TryGiveItemstack(stack)) { - AssetLocation sound = stack.Block?.Sounds?.Place; - Api.World.PlaySoundAt(sound != null ? sound : new AssetLocation("sounds/player/build"), byPlayer.Entity, byPlayer, true, 16); + SoundAttributes sound = stack.Block?.Sounds?.Place ?? new SoundAttributes(new AssetLocation("sounds/player/build"), true); + Api.World.PlaySoundAt(sound, byPlayer, byPlayer, 0.5f); } updateMesh(i); @@ -213,8 +213,8 @@ private bool TryTake(IPlayer byPlayer, BlockSelection blockSel) ItemStack stack = inventory[index].TakeOut(1); if (stack != null && byPlayer.InventoryManager.TryGiveItemstack(stack)) { - AssetLocation sound = stack.Block?.Sounds?.Place; - Api.World.PlaySoundAt(sound != null ? sound : new AssetLocation("sounds/player/build"), byPlayer.Entity, byPlayer, true, 16); + SoundAttributes sound = stack.Block?.Sounds?.Place ?? new SoundAttributes(new AssetLocation("sounds/player/build"), true); + Api.World.PlaySoundAt(sound, byPlayer, byPlayer, 0.5f); } if (stack.StackSize > 0) diff --git a/Substrate/Substrate/Blocks/BlockFruitingBag.cs b/Substrate/Blocks/BlockFruitingBag.cs similarity index 100% rename from Substrate/Substrate/Blocks/BlockFruitingBag.cs rename to Substrate/Blocks/BlockFruitingBag.cs diff --git a/Substrate/Substrate/Blocks/BlockGrowBed.cs b/Substrate/Blocks/BlockGrowBed.cs similarity index 100% rename from Substrate/Substrate/Blocks/BlockGrowBed.cs rename to Substrate/Blocks/BlockGrowBed.cs diff --git a/Substrate/Substrate/Blocks/BlockSporePaper.cs b/Substrate/Blocks/BlockSporePaper.cs similarity index 100% rename from Substrate/Substrate/Blocks/BlockSporePaper.cs rename to Substrate/Blocks/BlockSporePaper.cs diff --git a/Substrate/Substrate/Patches/BlockPlantPatches.cs b/Substrate/Patches/BlockPlantPatches.cs similarity index 72% rename from Substrate/Substrate/Patches/BlockPlantPatches.cs rename to Substrate/Patches/BlockPlantPatches.cs index 3fcc7d6..70f43a7 100644 --- a/Substrate/Substrate/Patches/BlockPlantPatches.cs +++ b/Substrate/Patches/BlockPlantPatches.cs @@ -12,12 +12,11 @@ namespace Substrate.Patches { - [HarmonyPatch] - internal class BlockPlantPatches + [HarmonyPatch(typeof(BlockRequireFertileGround), nameof(BlockRequireFertileGround.CanPlantStay))] + public class FertilityCheckPatch { [HarmonyPostfix] - [HarmonyPatch(typeof(BlockPlant), nameof(BlockPlant.CanPlantStay))] - internal static void AllowStayOnGrowBed(BlockPlant __instance, IBlockAccessor blockAccessor, BlockPos pos, ref bool __result) + public static void Postfix(BlockRequireFertileGround __instance, IBlockAccessor blockAccessor, BlockPos pos, ref bool __result) { if (__instance is not BlockMushroom mushroom) return; diff --git a/Substrate/Substrate/Properties/launchSettings.json b/Substrate/Properties/launchSettings.json similarity index 100% rename from Substrate/Substrate/Properties/launchSettings.json rename to Substrate/Properties/launchSettings.json diff --git a/Substrate/Substrate.csproj b/Substrate/Substrate.csproj new file mode 100644 index 0000000..969fde2 --- /dev/null +++ b/Substrate/Substrate.csproj @@ -0,0 +1,49 @@ + + + + net10.0 + false + bin\$(Configuration)\Mods\mod + enable + + + + + $(VINTAGE_STORY)/VintagestoryAPI.dll + false + + + $(VINTAGE_STORY)/Mods/VSSurvivalMod.dll + False + + + $(VINTAGE_STORY)/Mods/VSEssentials.dll + False + + + $(VINTAGE_STORY)/Mods/VSCreativeMod.dll + False + + + $(VINTAGE_STORY)/Lib/Newtonsoft.Json.dll + False + + + $(VINTAGE_STORY)/Lib/0Harmony.dll + False + + + + + + PreserveNewest + + + + + + PreserveNewest + + + + diff --git a/Substrate/Substrate.sln b/Substrate/Substrate.sln deleted file mode 100644 index e4d0e76..0000000 --- a/Substrate/Substrate.sln +++ /dev/null @@ -1,28 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Substrate", "Substrate\Substrate.csproj", "{CB2100BC-F653-402A-9FBA-EA463C2BD4FC}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CakeBuild", "ZZCakeBuild\CakeBuild.csproj", "{BC68EDF6-C294-4819-B7F4-9EA99B73E69D}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BC68EDF6-C294-4819-B7F4-9EA99B73E69D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BC68EDF6-C294-4819-B7F4-9EA99B73E69D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BC68EDF6-C294-4819-B7F4-9EA99B73E69D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BC68EDF6-C294-4819-B7F4-9EA99B73E69D}.Release|Any CPU.Build.0 = Release|Any CPU - {CB2100BC-F653-402A-9FBA-EA463C2BD4FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB2100BC-F653-402A-9FBA-EA463C2BD4FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB2100BC-F653-402A-9FBA-EA463C2BD4FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB2100BC-F653-402A-9FBA-EA463C2BD4FC}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection -EndGlobal diff --git a/Substrate/Substrate/Substrate.csproj b/Substrate/Substrate/Substrate.csproj deleted file mode 100644 index ecae52d..0000000 --- a/Substrate/Substrate/Substrate.csproj +++ /dev/null @@ -1,80 +0,0 @@ - - - - net7.0 - false - bin\$(Configuration)\Mods\mod - - - - - $(VINTAGE_STORY)/VintagestoryAPI.dll - false - - - $(VINTAGE_STORY)/Mods/VSSurvivalMod.dll - False - - - $(VINTAGE_STORY)/Mods/VSEssentials.dll - False - - - $(VINTAGE_STORY)/Mods/VSCreativeMod.dll - False - - - $(VINTAGE_STORY)/Lib/Newtonsoft.Json.dll - False - - - $(VINTAGE_STORY)/Lib/0Harmony.dll - False - - - $(VINTAGE_STORY)/VintagestoryLib.dll - false - - - $(VINTAGE_STORY)/Lib/protobuf-net.dll - False - - - $(VINTAGE_STORY)/Lib/cairo-sharp.dll - False - - - $(VINTAGE_STORY)/Lib/Microsoft.Data.Sqlite.dll - False - - - - - - PreserveNewest - - - - - - - - - - - - - - - - - PreserveNewest - - - - - - - - - diff --git a/Substrate/Substrate/modinfo.json b/Substrate/Substrate/modinfo.json deleted file mode 100644 index 8895895..0000000 --- a/Substrate/Substrate/modinfo.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "code", - "modid": "substrate", - "name": "Substrate", - "authors": [ - "willis81808" - ], - "description": "To be added", - "version": "1.1.1", - "dependencies": { - "game": "" - } -} \ No newline at end of file diff --git a/Substrate/Substrate/SubstrateModSystem.cs b/Substrate/SubstrateModSystem.cs similarity index 100% rename from Substrate/Substrate/SubstrateModSystem.cs rename to Substrate/SubstrateModSystem.cs diff --git a/Substrate/Substrate/Utils/CodecPattern/Builders.cs b/Substrate/Utils/CodecPattern/Builders.cs similarity index 100% rename from Substrate/Substrate/Utils/CodecPattern/Builders.cs rename to Substrate/Utils/CodecPattern/Builders.cs diff --git a/Substrate/Substrate/Utils/CodecPattern/Codec.cs b/Substrate/Utils/CodecPattern/Codec.cs similarity index 100% rename from Substrate/Substrate/Utils/CodecPattern/Codec.cs rename to Substrate/Utils/CodecPattern/Codec.cs diff --git a/Substrate/Substrate/Utils/CodecPattern/Codecs/AttributeCodec.cs b/Substrate/Utils/CodecPattern/Codecs/AttributeCodec.cs similarity index 100% rename from Substrate/Substrate/Utils/CodecPattern/Codecs/AttributeCodec.cs rename to Substrate/Utils/CodecPattern/Codecs/AttributeCodec.cs diff --git a/Substrate/Substrate/Utils/CodecPattern/Codecs/ItemStackCodec.cs b/Substrate/Utils/CodecPattern/Codecs/ItemStackCodec.cs similarity index 100% rename from Substrate/Substrate/Utils/CodecPattern/Codecs/ItemStackCodec.cs rename to Substrate/Utils/CodecPattern/Codecs/ItemStackCodec.cs diff --git a/Substrate/Substrate/Utils/CodecPattern/Extensions.cs b/Substrate/Utils/CodecPattern/Extensions.cs similarity index 100% rename from Substrate/Substrate/Utils/CodecPattern/Extensions.cs rename to Substrate/Utils/CodecPattern/Extensions.cs diff --git a/Substrate/Substrate/Utils/Collectibles.cs b/Substrate/Utils/Collectibles.cs similarity index 100% rename from Substrate/Substrate/Utils/Collectibles.cs rename to Substrate/Utils/Collectibles.cs diff --git a/Substrate/Substrate/Utils/ExtensionMethods.cs b/Substrate/Utils/ExtensionMethods.cs similarity index 100% rename from Substrate/Substrate/Utils/ExtensionMethods.cs rename to Substrate/Utils/ExtensionMethods.cs diff --git a/Substrate/ZZCakeBuild/Program.cs b/Substrate/ZZCakeBuild/Program.cs deleted file mode 100644 index ccd96fd..0000000 --- a/Substrate/ZZCakeBuild/Program.cs +++ /dev/null @@ -1,120 +0,0 @@ -using Cake.Common; -using Cake.Common.IO; -using Cake.Common.Tools.DotNet; -using Cake.Common.Tools.DotNet.Clean; -using Cake.Common.Tools.DotNet.Publish; -using Cake.Core; -using Cake.Frosting; -using Cake.Json; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using System; -using System.IO; -using Vintagestory.API.Common; - -namespace CakeBuild -{ - public static class Program - { - public static int Main(string[] args) - { - return new CakeHost() - .UseContext() - .Run(args); - } - } - - public class BuildContext : FrostingContext - { - public const string ProjectName = "Substrate"; - public string BuildConfiguration { get; } - public string Version { get; } - public string Name { get; } - public bool SkipJsonValidation { get; } - - public BuildContext(ICakeContext context) - : base(context) - { - BuildConfiguration = context.Argument("configuration", "Release"); - SkipJsonValidation = context.Argument("skipJsonValidation", false); - var modInfo = context.DeserializeJsonFromFile($"../{ProjectName}/modinfo.json"); - Version = modInfo.Version; - Name = modInfo.ModID; - } - } - - [TaskName("ValidateJson")] - public sealed class ValidateJsonTask : FrostingTask - { - public override void Run(BuildContext context) - { - if (context.SkipJsonValidation) - { - return; - } - var jsonFiles = context.GetFiles($"../{BuildContext.ProjectName}/assets/**/*.json"); - foreach (var file in jsonFiles) - { - try - { - var json = File.ReadAllText(file.FullPath); - JToken.Parse(json); - } - catch (JsonException ex) - { - throw new Exception($"Validation failed for JSON file: {file.FullPath}{Environment.NewLine}{ex.Message}", ex); - } - } - } - } - - [TaskName("Build")] - [IsDependentOn(typeof(ValidateJsonTask))] - public sealed class BuildTask : FrostingTask - { - public override void Run(BuildContext context) - { - context.DotNetClean($"../{BuildContext.ProjectName}/{BuildContext.ProjectName}.csproj", - new DotNetCleanSettings - { - Configuration = context.BuildConfiguration - }); - - - context.DotNetPublish($"../{BuildContext.ProjectName}/{BuildContext.ProjectName}.csproj", - new DotNetPublishSettings - { - Configuration = context.BuildConfiguration - }); - } - } - - [TaskName("Package")] - [IsDependentOn(typeof(BuildTask))] - public sealed class PackageTask : FrostingTask - { - public override void Run(BuildContext context) - { - context.EnsureDirectoryExists("../Releases"); - context.CleanDirectory("../Releases"); - context.EnsureDirectoryExists($"../Releases/{context.Name}"); - context.CopyFiles($"../{BuildContext.ProjectName}/bin/{context.BuildConfiguration}/Mods/mod/publish/*", $"../Releases/{context.Name}"); - if (context.DirectoryExists($"../{BuildContext.ProjectName}/assets")) - { - context.CopyDirectory($"../{BuildContext.ProjectName}/assets", $"../Releases/{context.Name}/assets"); - } - context.CopyFile($"../{BuildContext.ProjectName}/modinfo.json", $"../Releases/{context.Name}/modinfo.json"); - if (context.FileExists($"../{BuildContext.ProjectName}/modicon.png")) - { - context.CopyFile($"../{BuildContext.ProjectName}/modicon.png", $"../Releases/{context.Name}/modicon.png"); - } - context.Zip($"../Releases/{context.Name}", $"../Releases/{context.Name}_{context.Version}.zip"); - } - } - - [TaskName("Default")] - [IsDependentOn(typeof(PackageTask))] - public class DefaultTask : FrostingTask - { - } -} \ No newline at end of file diff --git a/Substrate/Substrate/assets/substrate/blocktypes/fruitingbag.json b/Substrate/assets/substrate/blocktypes/fruitingbag.json similarity index 100% rename from Substrate/Substrate/assets/substrate/blocktypes/fruitingbag.json rename to Substrate/assets/substrate/blocktypes/fruitingbag.json diff --git a/Substrate/Substrate/assets/substrate/blocktypes/growbed.json b/Substrate/assets/substrate/blocktypes/growbed.json similarity index 92% rename from Substrate/Substrate/assets/substrate/blocktypes/growbed.json rename to Substrate/assets/substrate/blocktypes/growbed.json index dcd19a5..0f15e3c 100644 --- a/Substrate/Substrate/assets/substrate/blocktypes/growbed.json +++ b/Substrate/assets/substrate/blocktypes/growbed.json @@ -71,7 +71,15 @@ "redwinecap", "saffronmilkcap", "violetwebcap", - "witchhat" + "witchhat", + "bluemeanie", + "foolsconecap", + "goldcap", + "honeymushroom", + "laughingjim", + "libertycap", + "sickener", + "wavycap" ], "refundItem": "game:plank-oak", "refundAmount": { diff --git a/Substrate/Substrate/assets/substrate/blocktypes/sporepaper.json b/Substrate/assets/substrate/blocktypes/sporepaper.json similarity index 100% rename from Substrate/Substrate/assets/substrate/blocktypes/sporepaper.json rename to Substrate/assets/substrate/blocktypes/sporepaper.json diff --git a/Substrate/Substrate/assets/substrate/blocktypes/sporepaperprinted.json b/Substrate/assets/substrate/blocktypes/sporepaperprinted.json similarity index 93% rename from Substrate/Substrate/assets/substrate/blocktypes/sporepaperprinted.json rename to Substrate/assets/substrate/blocktypes/sporepaperprinted.json index 337f179..beba462 100644 --- a/Substrate/Substrate/assets/substrate/blocktypes/sporepaperprinted.json +++ b/Substrate/assets/substrate/blocktypes/sporepaperprinted.json @@ -53,7 +53,15 @@ "redwinecap", "saffronmilkcap", "violetwebcap", - "witchhat" + "witchhat", + "bluemeanie", + "foolsconecap", + "goldcap", + "honeymushroom", + "laughingjim", + "libertycap", + "sickener", + "wavycap" ] }, { diff --git a/Substrate/Substrate/assets/substrate/itemtypes/sawdust.json b/Substrate/assets/substrate/itemtypes/sawdust.json similarity index 98% rename from Substrate/Substrate/assets/substrate/itemtypes/sawdust.json rename to Substrate/assets/substrate/itemtypes/sawdust.json index 7c33655..d87a14c 100644 --- a/Substrate/Substrate/assets/substrate/itemtypes/sawdust.json +++ b/Substrate/assets/substrate/itemtypes/sawdust.json @@ -1,4 +1,5 @@ { + "enabled": false, "code": "sawdust", "maxstacksize": 64, "behaviors": [ diff --git a/Substrate/Substrate/assets/substrate/itemtypes/sporeprint.json b/Substrate/assets/substrate/itemtypes/sporeprint.json similarity index 94% rename from Substrate/Substrate/assets/substrate/itemtypes/sporeprint.json rename to Substrate/assets/substrate/itemtypes/sporeprint.json index 59cf7b0..b20e686 100644 --- a/Substrate/Substrate/assets/substrate/itemtypes/sporeprint.json +++ b/Substrate/assets/substrate/itemtypes/sporeprint.json @@ -41,7 +41,15 @@ "redwinecap", "saffronmilkcap", "violetwebcap", - "witchhat" + "witchhat", + "bluemeanie", + "foolsconecap", + "goldcap", + "honeymushroom", + "laughingjim", + "libertycap", + "sickener", + "wavycap" ] } ], diff --git a/Substrate/Substrate/assets/substrate/itemtypes/wetsporepaper.json b/Substrate/assets/substrate/itemtypes/wetsporepaper.json similarity index 100% rename from Substrate/Substrate/assets/substrate/itemtypes/wetsporepaper.json rename to Substrate/assets/substrate/itemtypes/wetsporepaper.json diff --git a/Substrate/Substrate/assets/substrate/itemtypes/woodchip.json b/Substrate/assets/substrate/itemtypes/woodchip.json similarity index 98% rename from Substrate/Substrate/assets/substrate/itemtypes/woodchip.json rename to Substrate/assets/substrate/itemtypes/woodchip.json index 586aa0d..54ab909 100644 --- a/Substrate/Substrate/assets/substrate/itemtypes/woodchip.json +++ b/Substrate/assets/substrate/itemtypes/woodchip.json @@ -1,4 +1,5 @@ { + "enabled": false, "code": "woodchip", "maxstacksize": 128, "dimensions": { diff --git a/Substrate/Substrate/assets/substrate/lang/en.json b/Substrate/assets/substrate/lang/en.json similarity index 85% rename from Substrate/Substrate/assets/substrate/lang/en.json rename to Substrate/assets/substrate/lang/en.json index 899879d..43e89b4 100644 --- a/Substrate/Substrate/assets/substrate/lang/en.json +++ b/Substrate/assets/substrate/lang/en.json @@ -39,6 +39,14 @@ "item-sporeprint-saffronmilkcap": "Spore Print (Saffron Milkcap)", "item-sporeprint-violetwebcap": "Spore Print (Violet Web Cap)", "item-sporeprint-witchhat": "Spore Print (Witch's Hat)", + "item-sporeprint-bluemeanie": "Spore Print (Blue Meanie)", + "item-sporeprint-foolsconecap": "Spore Print (Fool's Conecap)", + "item-sporeprint-goldcap": "Spore Print (Gold Cap)", + "item-sporeprint-honeymushroom": "Spore Print (Honey Mushroom)", + "item-sporeprint-laughingjim": "Spore Print (Laughing Jim)", + "item-sporeprint-libertycap": "Spore Print (Liberty Cap)", + "item-sporeprint-sickener": "Spore Print (Sickener)", + "item-sporeprint-wavycap": "Spore Print (Wavy Cap)", "block-sporepaper-*": "Prepared Spore Paper", "block-fruitingbag": "Fruiting Bag", @@ -80,6 +88,16 @@ "block-sporepaperprinted-saffronmilkcap-*": "Imprinted Spore Paper (Saffron Milkcap)", "block-sporepaperprinted-violetwebcap-*": "Imprinted Spore Paper (Violet Web Cap)", "block-sporepaperprinted-witchhat-*": "Imprinted Spore Paper (Witch's Hat)", + "block-sporepaperprinted-bluemeanie-*": "Imprinted Spore Paper (Blue Meanie)", + "block-sporepaperprinted-foolsconecap-*": "Imprinted Spore Paper (Fool's Conecap)", + "block-sporepaperprinted-goldcap-*": "Imprinted Spore Paper (Gold Cap)", + "block-sporepaperprinted-honeymushroom-*": "Imprinted Spore Paper (Honey Mushroom)", + "block-sporepaperprinted-laughingjim-*": "Imprinted Spore Paper (Laughing Jim)", + "block-sporepaperprinted-libertycap-*": "Imprinted Spore Paper (Liberty Cap)", + "block-sporepaperprinted-sickener-*": "Imprinted Spore Paper (Sickener)", + "block-sporepaperprinted-wavycap-*": "Imprinted Spore Paper (Wavy Cap)", + + "block-handbooktitle-sporepaperprinted": "Imprinted Spore Paper", "block-handbooktext-sporepaperprinted": "Obtained by placing four of the same mushroom onto prepared spore paper and waiting for collection to complete.", @@ -136,5 +154,13 @@ "mushroom-redwinecap": "Red Wine Cap", "mushroom-saffronmilkcap": "Saffron Milkcap", "mushroom-violetwebcap": "Violet Web Cap", - "mushroom-witchhat": "Witch's Hat" + "mushroom-witchhat": "Witch's Hat", + "mushroom-bluemeanie": "Blue Meanie", + "mushroom-foolsconecap": "Fool's Conecap", + "mushroom-goldcap": "Gold Cap", + "mushroom-honeymushroom": "Honey Mushroom", + "mushroom-laughingjim": "Laughing Jim", + "mushroom-libertycap": "Liberty Cap", + "mushroom-sickener": "Sickener", + "mushroom-wavycap": "Wavy Cap" } \ No newline at end of file diff --git a/Substrate/Substrate/assets/substrate/patches/mushroom.json b/Substrate/assets/substrate/patches/mushroom.json similarity index 100% rename from Substrate/Substrate/assets/substrate/patches/mushroom.json rename to Substrate/assets/substrate/patches/mushroom.json diff --git a/Substrate/Substrate/assets/substrate/recipes/barrel/wetsporepaper.json b/Substrate/assets/substrate/recipes/barrel/wetsporepaper.json similarity index 100% rename from Substrate/Substrate/assets/substrate/recipes/barrel/wetsporepaper.json rename to Substrate/assets/substrate/recipes/barrel/wetsporepaper.json diff --git a/Substrate/Substrate/assets/substrate/recipes/grid/fruitingbag.json b/Substrate/assets/substrate/recipes/grid/fruitingbag.json similarity index 83% rename from Substrate/Substrate/assets/substrate/recipes/grid/fruitingbag.json rename to Substrate/assets/substrate/recipes/grid/fruitingbag.json index 1fa97af..ea4c94d 100644 --- a/Substrate/Substrate/assets/substrate/recipes/grid/fruitingbag.json +++ b/Substrate/assets/substrate/recipes/grid/fruitingbag.json @@ -21,9 +21,6 @@ "output": { "type": "block", "code": "fruitingbag", - "quantity": 1, - "attributes": { - "refundItem": "game:flaxtwine" - } + "quantity": 1 } } \ No newline at end of file diff --git a/Substrate/Substrate/assets/substrate/recipes/grid/growbed.json b/Substrate/assets/substrate/recipes/grid/growbed.json similarity index 85% rename from Substrate/Substrate/assets/substrate/recipes/grid/growbed.json rename to Substrate/assets/substrate/recipes/grid/growbed.json index 3b8778d..ed92d27 100644 --- a/Substrate/Substrate/assets/substrate/recipes/grid/growbed.json +++ b/Substrate/assets/substrate/recipes/grid/growbed.json @@ -27,9 +27,6 @@ "output": { "type": "block", "code": "growbed", - "quantity": 1, - "attributes": { - "refundItem": "game:plank-{wood}" - } + "quantity": 1 } } \ No newline at end of file diff --git a/Substrate/Substrate/assets/substrate/recipes/grid/sporeprint.json b/Substrate/assets/substrate/recipes/grid/sporeprint.json similarity index 100% rename from Substrate/Substrate/assets/substrate/recipes/grid/sporeprint.json rename to Substrate/assets/substrate/recipes/grid/sporeprint.json diff --git a/Substrate/Substrate/assets/substrate/recipes/grid/woodchip.json b/Substrate/assets/substrate/recipes/grid/woodchip.json similarity index 93% rename from Substrate/Substrate/assets/substrate/recipes/grid/woodchip.json rename to Substrate/assets/substrate/recipes/grid/woodchip.json index 3550597..2f66116 100644 --- a/Substrate/Substrate/assets/substrate/recipes/grid/woodchip.json +++ b/Substrate/assets/substrate/recipes/grid/woodchip.json @@ -1,4 +1,5 @@ { + "enabled": false, ingredientPattern: "A L", ingredients: { "A": { type: "item", code: "game:axe-*", isTool: true }, diff --git a/Substrate/Substrate/assets/substrate/shapes/block/fruitingbag.json b/Substrate/assets/substrate/shapes/block/fruitingbag.json similarity index 100% rename from Substrate/Substrate/assets/substrate/shapes/block/fruitingbag.json rename to Substrate/assets/substrate/shapes/block/fruitingbag.json diff --git a/Substrate/Substrate/assets/substrate/shapes/block/growbed.json b/Substrate/assets/substrate/shapes/block/growbed.json similarity index 100% rename from Substrate/Substrate/assets/substrate/shapes/block/growbed.json rename to Substrate/assets/substrate/shapes/block/growbed.json diff --git a/Substrate/Substrate/assets/substrate/textures/block/fruitingbag-depleted.png b/Substrate/assets/substrate/textures/block/fruitingbag-depleted.png similarity index 100% rename from Substrate/Substrate/assets/substrate/textures/block/fruitingbag-depleted.png rename to Substrate/assets/substrate/textures/block/fruitingbag-depleted.png diff --git a/Substrate/Substrate/assets/substrate/textures/block/growbed/soil-substrate.png b/Substrate/assets/substrate/textures/block/growbed/soil-substrate.png similarity index 100% rename from Substrate/Substrate/assets/substrate/textures/block/growbed/soil-substrate.png rename to Substrate/assets/substrate/textures/block/growbed/soil-substrate.png diff --git a/Substrate/Substrate/assets/substrate/textures/block/growbed/wood.png b/Substrate/assets/substrate/textures/block/growbed/wood.png similarity index 100% rename from Substrate/Substrate/assets/substrate/textures/block/growbed/wood.png rename to Substrate/assets/substrate/textures/block/growbed/wood.png diff --git a/Substrate/Substrate/assets/substrate/textures/block/sporepaper-blank.png b/Substrate/assets/substrate/textures/block/sporepaper-blank.png similarity index 100% rename from Substrate/Substrate/assets/substrate/textures/block/sporepaper-blank.png rename to Substrate/assets/substrate/textures/block/sporepaper-blank.png diff --git a/Substrate/Substrate/assets/substrate/textures/block/sporepaper-printed.png b/Substrate/assets/substrate/textures/block/sporepaper-printed.png similarity index 100% rename from Substrate/Substrate/assets/substrate/textures/block/sporepaper-printed.png rename to Substrate/assets/substrate/textures/block/sporepaper-printed.png diff --git a/Substrate/Substrate/assets/substrate/textures/item/sawdust.png b/Substrate/assets/substrate/textures/item/sawdust.png similarity index 100% rename from Substrate/Substrate/assets/substrate/textures/item/sawdust.png rename to Substrate/assets/substrate/textures/item/sawdust.png diff --git a/Substrate/Substrate/assets/substrate/textures/item/sporeprint.png b/Substrate/assets/substrate/textures/item/sporeprint.png similarity index 100% rename from Substrate/Substrate/assets/substrate/textures/item/sporeprint.png rename to Substrate/assets/substrate/textures/item/sporeprint.png diff --git a/Substrate/Substrate/assets/substrate/textures/item/wetsporepaper.png b/Substrate/assets/substrate/textures/item/wetsporepaper.png similarity index 100% rename from Substrate/Substrate/assets/substrate/textures/item/wetsporepaper.png rename to Substrate/assets/substrate/textures/item/wetsporepaper.png diff --git a/Substrate/build.ps1 b/Substrate/build.ps1 deleted file mode 100644 index a2ee10a..0000000 --- a/Substrate/build.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -dotnet run --project ZZCakeBuild/CakeBuild.csproj -- $args -exit $LASTEXITCODE; \ No newline at end of file diff --git a/Substrate/build.sh b/Substrate/build.sh deleted file mode 100644 index 1a40ae7..0000000 --- a/Substrate/build.sh +++ /dev/null @@ -1 +0,0 @@ -dotnet run --project ./ZZCakeBuild/CakeBuild.csproj -- "$@" diff --git a/Substrate/modicon.png b/Substrate/modicon.png new file mode 100644 index 0000000000000000000000000000000000000000..822008ec897b85e14d76dadcb585e53df5474b78 GIT binary patch literal 24492 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 OXC*mx*{YYO!T%3E8lvI= literal 0 HcmV?d00001 diff --git a/Substrate/modinfo.json b/Substrate/modinfo.json new file mode 100644 index 0000000..3aacb6b --- /dev/null +++ b/Substrate/modinfo.json @@ -0,0 +1,13 @@ +{ + "type": "code", + "modid": "substrate", + "name": "Substrate", + "authors": [ + "Averixus", "willis81808", "MrFlame" + ], + "description": "Adds a realistic way to grow mushrooms.", + "version": "2.0.0", + "dependencies": { + "game": "1.22.0" + } +} \ No newline at end of file diff --git a/build.ps1 b/build.ps1 new file mode 100644 index 0000000..6be84e3 --- /dev/null +++ b/build.ps1 @@ -0,0 +1,2 @@ +dotnet run --project CakeBuild/CakeBuild.csproj -- $args +exit $LASTEXITCODE; \ No newline at end of file diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..41f254a --- /dev/null +++ b/build.sh @@ -0,0 +1 @@ +dotnet run --project ./CakeBuild/CakeBuild.csproj -- "$@"