Skip to content

Commit

Permalink
[v2.3.1+1.19] bump version (#52)
Browse files Browse the repository at this point in the history
* bump fabric deps

* bump mod deps

* use BlockEntityRendererFactories instead

* bump version

* setup release plugin

* add release workflow
  • Loading branch information
Aton-Kish committed Feb 19, 2023
1 parent 9c5cc20 commit def8f32
Show file tree
Hide file tree
Showing 5 changed files with 103 additions and 40 deletions.
8 changes: 0 additions & 8 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
# Automatically build the project and run any configured tests for every push
# and submitted pull request. This can help catch issues that only occur on
# certain platforms or Java versions, and provides a first line of defence
# against bad commits.

name: build
on:
push:
tags:
- v[0-9]+.[0-9]+.[0-9]+*
pull_request:
branches:
- 1.[0-9]+
Expand Down
32 changes: 32 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: release
on:
push:
tags:
- v[0-9]+.[0-9]+.[0-9]+*

jobs:
build:
runs-on: ubuntu-22.04
env:
JAVA_VERSION: 17
ORG_GRADLE_PROJECT_curseforge_token: ${{ secrets.CURSEFORGE_TOKEN }}
ORG_GRADLE_PROJECT_modrinth_token: ${{ secrets.MODRINTH_TOKEN }}
steps:
- name: checkout repository
uses: actions/checkout@v3
- name: validate gradle wrapper
uses: gradle/wrapper-validation-action@v1
- name: setup jdk ${{ env.JAVA_VERSION }}
uses: actions/setup-java@v3
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: "microsoft"
- name: make gradle wrapper executable
run: chmod +x ./gradlew
- name: release
run: ./gradlew build curseforge modrinth
- name: capture build artifacts
uses: actions/upload-artifact@v3
with:
name: Artifacts
path: build/libs/
74 changes: 57 additions & 17 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
plugins {
id 'fabric-loom' version '1.0-SNAPSHOT'
id 'maven-publish'
id "fabric-loom" version "1.0-SNAPSHOT"
id "maven-publish"
id "com.matthewprenger.cursegradle" version "1.4.0"
id "com.modrinth.minotaur" version "2.+"
}

sourceCompatibility = JavaVersion.VERSION_17
Expand Down Expand Up @@ -37,15 +39,6 @@ repositories {
url "https://maven.kyrptonaught.dev"
}

// <-- workaround
maven {
url "https://www.cursemaven.com"
content {
includeGroup "curse.maven"
}
}
// -->

// Shulker Box Tooltip
maven {
url "https://maven.misterpemodder.com/libs-release"
Expand Down Expand Up @@ -74,12 +67,7 @@ dependencies {
modImplementation "atonkish.reinfchest:reinforced-chests:${project.reinforced_chests_version}"

// Quick Shulker
// modImplementation "net.kyrptonaught:quickshulker:${project.quick_shulker_version}"
// <-- workaround
modImplementation "curse.maven:quick-shulker-362669:${project.quick_shulker_file_id}"
modImplementation "net.kyrptonaught:kyrptconfig:${project.kyrptconfig_version}"
modImplementation "net.kyrptonaught:shulkerutils:${project.shulkerutils_version}"
// -->
modImplementation "net.kyrptonaught:quickshulker:${project.quick_shulker_version}"

// Shulker Box Tooltip
modImplementation "com.misterpemodder:shulkerboxtooltip-fabric:${project.shulker_box_tooltip_version}"
Expand Down Expand Up @@ -130,3 +118,55 @@ publishing {
}
}
}

curseforge {
apiKey = project.findProperty("curseforge_token") ?: "Missing token"

project {
id = project.curseforge_id

mainArtifact(remapJar) {
displayName = "Reinforced Shulker Boxes v${project.version}"
}
releaseType = "release"
changelogType = "markdown"
changelog = "[v${project.version}](https://github.com/Aton-Kish/reinforced-shulker-boxes/releases/tag/v" + java.net.URLEncoder.encode(project.version, "UTF-8") + ")"

addGameVersion "Fabric"
addGameVersion "Java 17"
addGameVersion "1.19.3"

relations {
requiredDependency "fabric-api"
embeddedLibrary "cloth-config"
optionalDependency "modmenu"
optionalDependency "shulkerboxtooltip"
optionalDependency "quick-shulker"
optionalDependency "reinforced-chests"
}
}
}

modrinth {
token = project.findProperty("modrinth_token") ?: "Missing token"

projectId = project.modrinth_id

uploadFile = remapJar
versionNumber = project.version
versionName = "Reinforced Shulker Boxes v${project.version}"
versionType = "release"
changelog = "[v${project.version}](https://github.com/Aton-Kish/reinforced-shulker-boxes/releases/tag/v" + java.net.URLEncoder.encode(project.version, "UTF-8") + ")"

gameVersions = ["1.19.3"]
loaders = ["fabric"]

dependencies {
required.project "fabric-api"
embedded.project "cloth-config"
optional.project "modmenu"
optional.project "shulkerboxtooltip"
optional.project "quickshulker"
optional.project "reinforced-chests"
}
}
25 changes: 12 additions & 13 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,21 @@ org.gradle.parallel=true
# Fabric Properties
# check these on https://fabricmc.net/develop
minecraft_version=1.19.3
yarn_mappings=1.19.3+build.3
loader_version=0.14.11
yarn_mappings=1.19.3+build.5
loader_version=0.14.14

# Mod Properties
mod_version=2.3.0+1.19
mod_version=2.3.1+1.19
maven_group=atonkish.reinfshulker
archives_base_name=reinforced-shulker-boxes

# Dependencies
fabric_version=0.69.1+1.19.3
reinforced_core_version=3.0.4+1.19
reinforced_chests_version=2.3.0+1.19
# quick_shulker_version=1.3.10-1.19.3
# <-- workaround
quick_shulker_file_id=4171682
kyrptconfig_version=1.5.1-1.19.3
shulkerutils_version=1.0.4-1.19
# -->
shulker_box_tooltip_version=3.2.3+1.19.3
fabric_version=0.74.0+1.19.3
reinforced_core_version=3.0.5+1.19
reinforced_chests_version=2.3.1+1.19
quick_shulker_version=1.3.10-1.19.3
shulker_box_tooltip_version=3.2.4+1.19.3

# Distribution platform
curseforge_id=529874
modrinth_id=xlOwuSdN
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.client.rendering.v1.BlockEntityRendererRegistry;
import net.fabricmc.fabric.api.client.rendering.v1.BuiltinItemRendererRegistry;
import net.fabricmc.loader.api.FabricLoader;

import net.minecraft.block.Block;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.block.entity.BlockEntityRendererFactories;
import net.minecraft.client.render.model.json.ModelTransformation;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.item.ItemStack;
Expand Down Expand Up @@ -63,7 +63,7 @@ private static void initializeReinforcedShulkerBoxesClient() {
material);

// Block Entity Renderer
BlockEntityRendererRegistry
BlockEntityRendererFactories
.register(ModBlockEntityType.REINFORCED_SHULKER_BOX_MAP.get(material),
ReinforcedShulkerBoxBlockEntityRenderer::new);

Expand Down

0 comments on commit def8f32

Please sign in to comment.