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.

Sign up for GitHub

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

Update to Minecraft 1.20.2 #20

Merged
merged 3 commits into from
Jan 2, 2024
Merged

Update to Minecraft 1.20.2 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05d6d06
1.20.2
TacoMonkey11 Dec 29, 2023
0a70761
Checkstyle...
TacoMonkey11 Dec 29, 2023
ceb1b26
Finish preparing for release (Minecraft 1.20.2)
thefirethirteen Jan 2, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ jobs:

files: build/libs/!(*-@(dev|sources)).jar

name: Release 5.1.2 for Minecraft 1.20 and later
version: 5.1.2+1.20-and-later
name: Release 5.2.0 for Minecraft 1.20.2
version: 5.2.0+1.20.2
version-type: release

loaders: |
Expand All @@ -63,7 +63,7 @@ jobs:
fabric-api@*(required){modrinth:P7dR8mSH}{curseforge:306612}#(ignore:github)

game-versions: |
[1.20-rc1,1.20.1]
[1.20.2]

game-version-filter: none

Expand Down
4 changes: 3 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id 'fabric-loom'
id 'io.github.juuxel.loom-quiltflower'
id 'checkstyle'
}

Expand Down Expand Up @@ -54,6 +53,9 @@ dependencies {
modImplementation(fabricApi.module('fabric-blockrenderlayer-v1', project.fabric_api_version))
modImplementation(fabricApi.module('fabric-data-generation-api-v1', project.fabric_api_version))

// Vineflower
vineflowerDecompilerClasspath "org.vineflower:vineflower:1.9.3"


if (project.use_third_party_mods == 'true') {
configurations {
Expand Down
19 changes: 9 additions & 10 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,23 @@ org.gradle.parallel = true
org.gradle.workers.max = 3

# Gradle Plugins
fabric_loom_version = 1.2-SNAPSHOT
loom_quiltflower_version = 1.10.0
fabric_loom_version = 1.4-SNAPSHOT
checkstyle_version = 10.12.1

# Mod Properties
mod_version = 5.1.2+1.20-and-later
mod_version = 5.2.0+1.20.2
maven_group = com.github.reviversmc
archives_base_name = modern-glass-doors

# Mod Dependencies
minecraft_version = 1.20.1
fabric_loader_version = 0.14.21
fabric_api_version = 0.84.0+1.20.1
yarn_mappings = 1.20.1+build.8
minecraft_version = 1.20.2
fabric_loader_version = 0.15.3
fabric_api_version = 0.91.2+1.20.2
yarn_mappings = 1.20.2+build.4

# Dev-Env Mods
use_third_party_mods = true
modmenu_version = 7.1.0
sodium_version = mc1.20-0.4.10
lithium_version = mc1.20.1-0.11.2
modmenu_version = 8.0.1
sodium_version = mc1.20.2-0.5.5
lithium_version = mc1.20.2-0.12.0
ferritecore_version = 6.0.1-fabric
1 change: 0 additions & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ pluginManagement {
}
plugins {
id 'fabric-loom' version "${fabric_loom_version}"
id 'io.github.juuxel.loom-quiltflower' version "${loom_quiltflower_version}"
}
}

Expand Down
10 changes: 4 additions & 6 deletions ...java/com/github/reviversmc/modern_glass_doors/datagen/ModernGlassDoorsRecipeProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
package com.github.reviversmc.modern_glass_doors.datagen;

import java.util.function.Consumer;

import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider;
import net.minecraft.block.Blocks;
import net.minecraft.data.server.recipe.RecipeJsonProvider;
import net.minecraft.data.server.recipe.RecipeExporter;
import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder;
import net.minecraft.item.ItemConvertible;
import net.minecraft.recipe.book.RecipeCategory;
Expand All @@ -20,7 +18,7 @@ public ModernGlassDoorsRecipeProvider(FabricDataOutput output) {
}

@Override
public void generate(Consumer<RecipeJsonProvider> exporter) {
public void generate(RecipeExporter exporter) {
for (GlassDoorBlock door : ModernGlassDoorsBlocks.GLASS_DOORS) {
createGlassDoorRecipe(exporter, door, door.getParentDoorType());
createDoorFromGlassDoorRecipe(exporter, door.getParentDoorType(), door);
Expand All @@ -32,7 +30,7 @@ public void generate(Consumer<RecipeJsonProvider> exporter) {
}
}

private static void createGlassDoorRecipe(Consumer<RecipeJsonProvider> exporter, ItemConvertible output, ItemConvertible input) {
private static void createGlassDoorRecipe(RecipeExporter exporter, ItemConvertible output, ItemConvertible input) {
ShapelessRecipeJsonBuilder.create(RecipeCategory.REDSTONE, output)
.input(input)
.input(Blocks.GLASS_PANE)
Expand All @@ -41,7 +39,7 @@ private static void createGlassDoorRecipe(Consumer<RecipeJsonProvider> exporter,
.offerTo(exporter);
}

private static void createDoorFromGlassDoorRecipe(Consumer<RecipeJsonProvider> exporter, ItemConvertible output, ItemConvertible input) {
private static void createDoorFromGlassDoorRecipe(RecipeExporter exporter, ItemConvertible output, ItemConvertible input) {
ShapelessRecipeJsonBuilder.create(RecipeCategory.REDSTONE, output)
.input(input)
.criterion(hasItem(input), conditionsFromItem(input))
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
]
},
"depends": {
"minecraft": ">=1.20-pre.2",
"minecraft": "1.20.2",
"fabric-item-group-api-v1": "*",
"fabric-blockrenderlayer-v1": "*"
}
Expand Down