Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #754

Merged
merged 13 commits into from
Nov 7, 2024
Merged

Dev #754

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
name: Java CI - Build Release

on:
release:
types: [ published ]
push:
tags:
- 'v[0-9]+\.[0-9]+\.[0-9]+'
- 'v[0-9]+\.[0-9]+\.[0-9]+-[a-z]+'
- 'v[0-9]+\.[0-9]+\.[0-9]+-[a-z]+\.[0-9]+'

jobs:
build:
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

# [2101.1.1]

### Added
* The pinned quests panel now has a "Pinned Quests" title for clarity
* Added a feedback option for command reward
* In the case where running a command produces no obvious effect, this can help notify the player that something has happened

### Changed
* Overhauled and cleaned up many icon textures

### Fixed
* Fixed context menu tooltips sometimes appearing behind the context menu
* Fixed some issues with the reward table editor GUI (changes not getting correctly sync'd to server in some cases)

# [2101.1.0]

### Changed
Expand Down
11 changes: 10 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ plugins {
id "me.modmuss50.mod-publish-plugin" version "0.5.1"
}

apply from: 'https://raw.githubusercontent.com/FTBTeam/mods-meta/main/gradle/changelog.gradle'

architectury {
minecraft = rootProject.minecraft_version
}
Expand All @@ -13,6 +15,13 @@ subprojects {

loom {
silentMojangMappingsLicense()

runs {
client {
vmArgs "-Xmx4G"
programArgs "--width", "1920", "--height", "1080"
}
}
}

dependencies {
Expand Down Expand Up @@ -95,7 +104,7 @@ allprojects {

publishMods {
dryRun = providers.environmentVariable("CURSEFORGE_KEY").getOrNull() == null
changelog = providers.environmentVariable("CHANGELOG").getOrElse("No changelog provided")
changelog = createChangelog(project)
version = "${mod_version}"

// TODO: Migrate to something else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ protected ItemStack _insertItem(int slot, ItemStack stack, boolean simulate) {
return stack;
}

LootCrate crate = LootCrateItem.getCrate(stack);
LootCrate crate = LootCrateItem.getCrate(stack, false);
if (crate == null) {
return stack;
}
Expand Down Expand Up @@ -160,7 +160,7 @@ protected ItemStack _insertItem(int slot, ItemStack stack, boolean simulate) {
}

protected boolean _isItemValid(int slot, ItemStack stack) {
return slot == 0 && LootCrateItem.getCrate(stack) != null;
return slot == 0 && LootCrateItem.getCrate(stack, level.isClientSide) != null;
}

protected ItemStack _extractItem(int slot, int amount, boolean simulate) {
Expand Down
Loading
Loading