Compare commits
No commits in common. "d001727c2d071f10c4a1133dc665d641605fc2fc" and "4ab4a8bb38aeda8cc303229348246f194fef7130" have entirely different histories.
d001727c2d
...
4ab4a8bb38
30
.github/workflows/tag.yml
vendored
Normal file
30
.github/workflows/tag.yml
vendored
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
name: Create Release
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- '*'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
create-release:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
|
- name: Create changelog text
|
||||||
|
id: changelog
|
||||||
|
uses: loopwerk/tag-changelog@v1
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
config_file: .github/workflows/tag_changelog_config.js
|
||||||
|
|
||||||
|
- name: Create release
|
||||||
|
uses: actions/create-release@latest
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
with:
|
||||||
|
tag_name: ${{ github.ref }}
|
||||||
|
release_name: ${{ github.ref }}
|
||||||
|
body: ${{ steps.changelog.outputs.changes }}
|
15
.github/workflows/tag_changelog_config.js
vendored
Normal file
15
.github/workflows/tag_changelog_config.js
vendored
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
module.exports = {
|
||||||
|
types: [
|
||||||
|
{ types: ["feat", "feature"], label: "🎉 New Features" },
|
||||||
|
{ types: ["fix", "bugfix"], label: "🐛 Bugfixes" },
|
||||||
|
{ types: ["improvements", "enhancement"], label: "🔨 Improvements" },
|
||||||
|
{ types: ["perf"], label: "🏎️ Performance Improvements" },
|
||||||
|
{ types: ["build", "ci"], label: "🏗️ Build System" },
|
||||||
|
{ types: ["refactor"], label: "🪚 Refactors" },
|
||||||
|
{ types: ["doc", "docs"], label: "📚 Documentation Changes" },
|
||||||
|
{ types: ["test", "tests"], label: "🔍 Tests" },
|
||||||
|
{ types: ["style"], label: "💅 Code Style Changes" },
|
||||||
|
{ types: ["chore"], label: "🧹 Chores" },
|
||||||
|
{ types: ["other"], label: "Other Changes" },
|
||||||
|
],
|
||||||
|
};
|
@ -1,69 +1,11 @@
|
|||||||
clone:
|
|
||||||
git:
|
|
||||||
image: woodpeckerci/plugin-git:latest
|
|
||||||
settings:
|
|
||||||
path: MagicStorageVoidBag
|
|
||||||
when:
|
|
||||||
event: tag
|
|
||||||
|
|
||||||
pipeline:
|
pipeline:
|
||||||
fetch-deps:
|
clone:
|
||||||
image: alpine/git:latest
|
git:
|
||||||
commands:
|
image: woodpeckerci/plugin-git
|
||||||
- git clone https://github.com/blushiemagic/MagicStorage.git
|
settings:
|
||||||
- wget https://github.com/tModLoader/tModLoader/releases/latest/download/tModLoader.zip
|
- path: MagicStorageVoidBag
|
||||||
- unzip -q tModLoader.zip -d tModLoader
|
|
||||||
- rm tModLoader.zip
|
|
||||||
- ln -sf $CI_WORKSPACE/tModLoader/Libraries/Native/Linux/libSDL2-2.0.so.0 $CI_WORKSPACE/tModLoader/Libraries/Native/Linux/libSDL2.so
|
|
||||||
- >
|
|
||||||
echo "<Project ToolsVersion=\"14.0\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">
|
|
||||||
<Import Project=\"$CI_WORKSPACE/tModLoader/tMLMod.targets\" />
|
|
||||||
</Project>" > tModLoader.targets
|
|
||||||
when:
|
|
||||||
event: tag
|
|
||||||
|
|
||||||
build:
|
build:
|
||||||
image: jackbondpreston/fna-alpine
|
image: mcr.microsoft.com/dotnet/sdk
|
||||||
commands:
|
commands:
|
||||||
- |
|
- ls
|
||||||
echo "Shell: $SHELL"
|
|
||||||
echo "CI_WORKSPACE: $CI_WORKSPACE"
|
|
||||||
- cat tModLoader.targets
|
|
||||||
- cd MagicStorage && dotnet build -c Release || true
|
|
||||||
- cp bin/Release/net6.0/MagicStorage.dll .
|
|
||||||
- cd $CI_WORKSPACE
|
|
||||||
- cd MagicStorageVoidBag
|
|
||||||
- rm -rf .git
|
|
||||||
- dotnet build -c Release || true
|
|
||||||
- cp bin/Release/net6.0/MagicStorageVoidBag.dll .
|
|
||||||
- cd $CI_WORKSPACE
|
|
||||||
- mkdir release
|
|
||||||
- cp ~/.local/share/Terraria/tModLoader/Mods/MagicStorageVoidBag.tmod release/
|
|
||||||
- cp MagicStorageVoidBag/MagicStorageVoidBag.dll release/
|
|
||||||
- ls release
|
|
||||||
when:
|
|
||||||
event: tag
|
|
||||||
|
|
||||||
gitea-release:
|
|
||||||
image: plugins/gitea-release
|
|
||||||
settings:
|
|
||||||
api_key:
|
|
||||||
from_secret: gitea-api-key
|
|
||||||
base_url: https://git.jackbondpreston.me
|
|
||||||
files: release/*
|
|
||||||
when:
|
|
||||||
event: tag
|
|
||||||
|
|
||||||
github-release:
|
|
||||||
image: plugins/github-release
|
|
||||||
settings:
|
|
||||||
api_key:
|
|
||||||
from_secret: github-api-key
|
|
||||||
base_url: https://github.com/api/v3/
|
|
||||||
upload_url: https://github.com/api/uploads
|
|
||||||
files: release/*
|
|
||||||
environment:
|
|
||||||
- DRONE_REPO_OWNER=jackbondpreston
|
|
||||||
- CI_REPO_OWNER=jackbondpreston
|
|
||||||
when:
|
|
||||||
event: tag
|
|
||||||
|
@ -1,23 +1,24 @@
|
|||||||
using MagicStorage.Components;
|
using MagicStorage.Components;
|
||||||
using MagicStorage.Items;
|
using MagicStorageVoidBag.Items;
|
||||||
using Terraria;
|
using Terraria;
|
||||||
using Terraria.DataStructures;
|
using Terraria.DataStructures;
|
||||||
using Terraria.Localization;
|
using Terraria.Localization;
|
||||||
|
using Terraria.ModLoader;
|
||||||
|
|
||||||
|
|
||||||
namespace MagicStorageVoidBag.Hooks {
|
namespace MagicStorageVoidBag.Hooks {
|
||||||
internal class StorageHeartRightClickHook {
|
internal class StorageHeartRightClickHook {
|
||||||
private static readonly log4net.ILog Logger = MagicStorageVoidBag.Instance.Logger;
|
private static readonly log4net.ILog Logger = MagicStorageVoidBag.Instance.Logger;
|
||||||
public static bool Hook(On.MagicStorage.Components.StorageHeart.orig_RightClick orig, MagicStorage.Components.StorageHeart heart, int i, int j) {
|
public static bool Hook(On.MagicStorage.Components.StorageHeart.orig_RightClick orig, StorageHeart heart, int i, int j) {
|
||||||
// https://github.com/blushiemagic/MagicStorage/blob/1.4-stable/Components/StorageHeart.cs#L23
|
// https://github.com/blushiemagic/MagicStorage/blob/1.4-stable/Components/StorageHeart.cs#L23
|
||||||
Player player = Main.LocalPlayer;
|
Player player = Main.LocalPlayer;
|
||||||
Item item = player.HeldItem;
|
Item item = player.HeldItem;
|
||||||
|
if (item.type == ModContent.ItemType<MSVoidBag>()) {
|
||||||
if (!item.IsAir && item.ModItem is Locator locator) {
|
|
||||||
if (Main.tile[i, j].TileFrameX % 36 == 18) i--;
|
if (Main.tile[i, j].TileFrameX % 36 == 18) i--;
|
||||||
if (Main.tile[i, j].TileFrameY % 36 == 18) j--;
|
if (Main.tile[i, j].TileFrameY % 36 == 18) j--;
|
||||||
|
|
||||||
locator.location = new Point16(i, j);
|
MSVoidBag bag = (MSVoidBag)item.ModItem;
|
||||||
|
bag.location = new Point16(i, j);
|
||||||
if (player.selectedItem == 58) {
|
if (player.selectedItem == 58) {
|
||||||
Main.mouseItem = item.Clone();
|
Main.mouseItem = item.Clone();
|
||||||
}
|
}
|
||||||
|
@ -12,10 +12,10 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="MagicStorage">
|
<Reference Include="MagicStorage">
|
||||||
<HintPath>..\MagicStorage\MagicStorage.dll</HintPath>
|
<HintPath>../Mod Libraries/MagicStorage.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="MagicStorageHooks">
|
<Reference Include="MagicStorageHooks">
|
||||||
<HintPath>lib\MagicStorage_Hooks.dll</HintPath>
|
<HintPath>lib\MagicStorageHooks.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
@ -1,8 +1,8 @@
|
|||||||
displayName = MagicStorage Void Bag
|
displayName = MagicStorage Void Bag
|
||||||
author = jack
|
author = jack
|
||||||
version = 1.3
|
version = 1.1
|
||||||
modReferences = MagicStorage
|
modReferences = MagicStorage
|
||||||
dllReferences = MagicStorage_Hooks
|
dllReferences = MagicStorageHooks
|
||||||
sortAfter = MagicStorage
|
sortAfter = MagicStorage
|
||||||
includeSource = true
|
includeSource = true
|
||||||
homepage = https://github.com/jackbondpreston/MagicStorageVoidBag
|
homepage = https://github.com/jackbondpreston/MagicStorageVoidBag
|
||||||
|
BIN
lib/MagicStorageHooks.dll
Normal file
BIN
lib/MagicStorageHooks.dll
Normal file
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user