Skip to content

Commit

Permalink
1.20.2
Browse files Browse the repository at this point in the history
  • Loading branch information
TacoMonkey11 committed Dec 29, 2023
1 parent cd27c1a commit 05d6d06
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 15 deletions.
4 changes: 3 additions & 1 deletion build.gradle
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
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-and-later
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
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.RecipeExporter;
import net.minecraft.data.server.recipe.RecipeJsonProvider;
import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder;
import net.minecraft.item.ItemConvertible;
Expand All @@ -20,7 +21,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 +33,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 +42,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

0 comments on commit 05d6d06

Please sign in to comment.