From 9d50ee8b3060935e54e6f14e494b04404d43ee0c Mon Sep 17 00:00:00 2001 From: Waterpicker Date: Sun, 20 Mar 2022 05:18:15 -0500 Subject: [PATCH] Forgot a bit of a schematic removal and forgot push some code. --- build.gradle | 2 +- gradle.properties | 4 +++- .../dimdev/dimdoors/datagen/FabricRecipeProvider.java | 10 ++++++++++ .../data/dimdoors/pockets/virtual/dungeon/default.json | 4 ---- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 38560733..df04f67d 100644 --- a/build.gradle +++ b/build.gradle @@ -155,7 +155,7 @@ dependencies { // testImplementation("net.devtech:PotatoUnit:1.0.2") } -version = computeVersion(project.mod_version) +version = computeVersion(project.mod_version) + "-" + project.minecraft_version archivesBaseName = "DimensionalDoors" static def computeVersion(String version) { diff --git a/gradle.properties b/gradle.properties index b9eff4a1..4aa3d429 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,6 @@ -mod_version=4.0.0+beta.4 +mod_version=4.0.1 + +minecraft_version=1.18.2 org.gradle.jvmargs=-Xmx2048m diff --git a/src/main/datagen/org/dimdev/dimdoors/datagen/FabricRecipeProvider.java b/src/main/datagen/org/dimdev/dimdoors/datagen/FabricRecipeProvider.java index c4ead743..5d095b0b 100644 --- a/src/main/datagen/org/dimdev/dimdoors/datagen/FabricRecipeProvider.java +++ b/src/main/datagen/org/dimdev/dimdoors/datagen/FabricRecipeProvider.java @@ -4,6 +4,7 @@ import java.util.Map; import java.util.function.Consumer; import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; +import net.minecraft.block.Blocks; import net.minecraft.data.server.recipe.RecipeJsonProvider; import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder; import org.dimdev.dimdoors.block.ModBlocks; @@ -23,6 +24,15 @@ public class FabricRecipeProvider extends net.fabricmc.fabric.api.datagen.v1.pro @Override protected void generateRecipes(Consumer exporter) { + ShapedRecipeJsonBuilder.create(ModBlocks.STONE_DOOR) + .group("stone_door") + .pattern("XX") + .pattern("XX") + .pattern("XX") + .input('X', Blocks.STONE) + .criterion("inventory_changed", InventoryChangedCriterion.Conditions.items(Blocks.STONE)) + .offerTo(exporter, new Identifier("dimdoors", "stone_door")); + for (Map.Entry entry : ModBlocks.FABRIC_BLOCKS.entrySet()) { DyeColor dyeColor = entry.getKey(); Block block = entry.getValue(); diff --git a/src/main/resources/resourcepacks/default/data/dimdoors/pockets/virtual/dungeon/default.json b/src/main/resources/resourcepacks/default/data/dimdoors/pockets/virtual/dungeon/default.json index 201b2cd7..4cc2dc5c 100644 --- a/src/main/resources/resourcepacks/default/data/dimdoors/pockets/virtual/dungeon/default.json +++ b/src/main/resources/resourcepacks/default/data/dimdoors/pockets/virtual/dungeon/default.json @@ -227,10 +227,6 @@ "id": "dungeon/ruins_deepslate_hub", "type": "dimdoors:id" }, - { - "id": "dungeon/jungle_riddle_fixed", - "type": "dimdoors:id" - }, { "id": "dungeon/small_sandstone_hallway", "type": "dimdoors:id"