From e252a0464e5edafe7b5fef955fe13620fd2f9c0a Mon Sep 17 00:00:00 2001 From: stfwi Date: Tue, 31 Aug 2021 21:07:39 +0200 Subject: [PATCH] Updated to Forge 1.17.1-37.0.51 (issue #186). Enabled JEI plugin. Added Shingle Roof recipe from Deep Slate Stairs. --- Makefile | 20 +++++------ build.gradle | 4 +-- gradle.properties | 6 ++-- meta/update.json | 4 ++- readme.md | 6 +++- .../java/wile/engineersdecor/ModContent.java | 5 ++- .../engineersdecor/eapi/jei/JEIPlugin.java | 24 +++++++------- ...rk_shingle_roof_from_deepslate_recipe.json | 33 +++++++++++++++++++ 8 files changed, 70 insertions(+), 32 deletions(-) create mode 100644 src/main/resources/data/engineersdecor/recipes/independent/dark_shingle_roof_from_deepslate_recipe.json diff --git a/Makefile b/Makefile index 9af6d54..1e8c458 100644 --- a/Makefile +++ b/Makefile @@ -32,30 +32,30 @@ default: mod all: clean clean-all mod | install mod: - @echo "[1.16] Building mod using gradle ..." + @echo "[1.17] Building mod using gradle ..." @$(GRADLE) build $(GRADLE_OPTS) run: - @echo "[1.16] Run client ..." + @echo "[1.17] Run client ..." @$(GRADLE) runClient assets: - @echo "[1.16] Running asset generators ..." + @echo "[1.17] Running asset generators ..." @$(TASK) assets data: - @echo "[1.16] Running data generators ..." + @echo "[1.17] Running data generators ..." @$(TASK) datagen clean: - @echo "[1.16] Cleaning ..." + @echo "[1.17] Cleaning ..." @rm -rf src/generated @rm -rf mcmodsrepo @rm -f build/libs/* @$(GRADLE) clean clean-all: - @echo "[1.16] Cleaning using gradle ..." + @echo "[1.17] Cleaning using gradle ..." @rm -rf mcmodsrepo @rm -f dist/* @rm -rf run/logs/ @@ -70,11 +70,11 @@ mrproper: clean-all @rm -f .classpath init: - @echo "[1.16] Initialising eclipse workspace using gradle ..." + @echo "[1.17] Initialising eclipse workspace using gradle ..." @$(GRADLE) eclipse sanitize: - @echo "[1.16] Running sanitising tasks ..." + @echo "[1.17] Running sanitising tasks ..." @$(TASK) sanitize @$(TASK) sync-languages @$(TASK) version-check @@ -88,11 +88,11 @@ start-server: install @$(TASK) start-server dist-check: - @echo "[1.16] Running dist checks ..." + @echo "[1.17] Running dist checks ..." @$(TASK) dist-check dist-files: clean-all init mod - @echo "[1.16] Distribution files ..." + @echo "[1.17] Distribution files ..." @mkdir -p dist @cp build/libs/$(MOD_JAR_PREFIX)* dist/ @$(TASK) dist diff --git a/build.gradle b/build.gradle index da6dec1..5fd4cea 100644 --- a/build.gradle +++ b/build.gradle @@ -53,8 +53,8 @@ minecraft { dependencies { minecraft "net.minecraftforge:forge:${version_forge_minecraft}" - //compileOnly fg.deobf("mezz.jei:jei-${version_jei}:api") - //runtimeOnly fg.deobf("mezz.jei:jei-${version_jei}") + compileOnly fg.deobf("mezz.jei:jei-${version_jei}:api") + runtimeOnly fg.deobf("mezz.jei:jei-${version_jei}") } processResources { diff --git a/gradle.properties b/gradle.properties index ca1f441..4b0ecc6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,6 +2,6 @@ org.gradle.daemon=false org.gradle.jvmargs=-Xmx8G version_minecraft=1.17.1 -version_forge_minecraft=1.17.1-37.0.17 -version_jei=1.16.4:7.6.1.63 -version_engineersdecor=1.1.17-b1 +version_forge_minecraft=1.17.1-37.0.51 +version_jei=1.17.1:8.0.0.15 +version_engineersdecor=1.1.17-b2 diff --git a/meta/update.json b/meta/update.json index f770ec3..9c4de0b 100644 --- a/meta/update.json +++ b/meta/update.json @@ -1,6 +1,8 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.17.1": { + "1.1.17-b2": "[F] Updated to Forge 1.17.1-37.0.51 to fix `ToolType not found` startup crash.\n[A] JEI plugin enabled.\n[A] Dark Shingle Roof recipe variant added.", + "1.1.17-b1": "[U] Initial MC 1.17.1 port.\n[M] Clinker Brick textures adapted to contemporary MC textures.\n[D] Gas Concrete dropped (Rebar Concrete suffices for texture variation).\n[D] Treated Wood Side Table dropped.\n[M] Updated zh_cn (PR#183, Lyaiya).", "1.1.14": "[R] Release build v1.1.14.", "1.1.14-b3": "[A] Spanish language support added (PR#180, thx FrannDzs).", "1.1.14-b2": "[F] Block Placer: Attempt circumventing external placement prevention.", @@ -40,6 +42,6 @@ }, "promos": { "1.17.1-recommended": "1.1.14", - "1.17.1-latest": "1.1.14" + "1.17.1-latest": "1.1.17-b2" } } \ No newline at end of file diff --git a/readme.md b/readme.md index 683817d..d58f8d1 100644 --- a/readme.md +++ b/readme.md @@ -11,7 +11,11 @@ Mod sources for Minecraft version 1.16.x. ## Version history - ~ v1.1.17-b1 [U] Initial MC 1.17.1 port. + - v1.1.17-b2 [F] Updated to Forge 1.17.1-37.0.51 to fix `ToolType not found` startup crash. + [A] JEI plugin enabled. + [A] Dark Shingle Roof recipe variant added. + + - v1.1.17-b1 [U] Initial MC 1.17.1 port. [M] Clinker Brick textures adapted to contemporary MC textures. [D] Gas Concrete dropped (Rebar Concrete suffices for texture variation). [D] Treated Wood Side Table dropped. diff --git a/src/main/java/wile/engineersdecor/ModContent.java b/src/main/java/wile/engineersdecor/ModContent.java index 01dd603..e90bd2e 100644 --- a/src/main/java/wile/engineersdecor/ModContent.java +++ b/src/main/java/wile/engineersdecor/ModContent.java @@ -41,7 +41,6 @@ import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.common.ToolType; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import org.apache.commons.lang3.ArrayUtils; @@ -307,12 +306,12 @@ public class ModContent public static final StandardBlocks.BaseBlock DENSE_GRIT_SAND = (StandardBlocks.BaseBlock)(new StandardBlocks.BaseBlock( DecorBlock.CFG_DEFAULT, - BlockBehaviour.Properties.of(Material.DIRT, MaterialColor.DIRT).strength(0.5f, 3f).sound(SoundType.GRAVEL).harvestTool(ToolType.SHOVEL) + BlockBehaviour.Properties.of(Material.DIRT, MaterialColor.DIRT).strength(0.1f, 3f).sound(SoundType.GRAVEL) )).setRegistryName(new ResourceLocation(MODID, "dense_grit_sand_block")); public static final StandardBlocks.BaseBlock DENSE_GRIT_DIRT = (StandardBlocks.BaseBlock)(new StandardBlocks.BaseBlock( DecorBlock.CFG_DEFAULT, - BlockBehaviour.Properties.of(Material.DIRT, MaterialColor.DIRT).strength(0.5f, 3f).sound(SoundType.GRAVEL).harvestTool(ToolType.SHOVEL) + BlockBehaviour.Properties.of(Material.DIRT, MaterialColor.DIRT).strength(0.1f, 3f).sound(SoundType.GRAVEL) )).setRegistryName(new ResourceLocation(MODID, "dense_grit_dirt_block")); public static final SlabSliceBlock HALFSLAB_DARK_CERAMIC_SHINGLE_ROOF = (SlabSliceBlock)(new SlabSliceBlock( diff --git a/src/main/java/wile/engineersdecor/eapi/jei/JEIPlugin.java b/src/main/java/wile/engineersdecor/eapi/jei/JEIPlugin.java index 83e7495..2cb810a 100644 --- a/src/main/java/wile/engineersdecor/eapi/jei/JEIPlugin.java +++ b/src/main/java/wile/engineersdecor/eapi/jei/JEIPlugin.java @@ -7,24 +7,25 @@ * JEI plugin (see https://github.com/mezz/JustEnoughItems/wiki/Creating-Plugins) */ package wile.engineersdecor.eapi.jei; -public class JEIPlugin {} - /* +public class JEIPlugin {} +*/ +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.Block; import mezz.jei.api.registration.IRecipeCatalystRegistration; -import wile.engineersdecor.ModEngineersDecor; -import wile.engineersdecor.ModConfig; -import wile.engineersdecor.ModContent; -import wile.engineersdecor.blocks.EdCraftingTable; import mezz.jei.api.constants.VanillaRecipeCategoryUid; import mezz.jei.api.registration.IRecipeTransferRegistration; import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.runtime.IJeiRuntime; -import net.minecraft.block.Block; -import net.minecraft.item.BlockItem; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import wile.engineersdecor.blocks.EdCraftingTable.CraftingTableTileEntity; +import wile.engineersdecor.libmc.detail.Auxiliaries; +import wile.engineersdecor.ModEngineersDecor; +import wile.engineersdecor.ModConfig; +import wile.engineersdecor.ModContent; +import wile.engineersdecor.blocks.EdCraftingTable; import java.util.HashSet; import java.util.List; @@ -92,4 +93,3 @@ public class JEIPlugin implements mezz.jei.api.IModPlugin } } } -*/ diff --git a/src/main/resources/data/engineersdecor/recipes/independent/dark_shingle_roof_from_deepslate_recipe.json b/src/main/resources/data/engineersdecor/recipes/independent/dark_shingle_roof_from_deepslate_recipe.json new file mode 100644 index 0000000..1bc24d9 --- /dev/null +++ b/src/main/resources/data/engineersdecor/recipes/independent/dark_shingle_roof_from_deepslate_recipe.json @@ -0,0 +1,33 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:dark_shingle_roof" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "D ", + "BD ", + "DBD" + ], + "key": { + "B": { + "item": "minecraft:brick" + }, + "D": { + "item": "minecraft:deepslate_tile_stairs" + } + }, + "result": { + "item": "engineersdecor:dark_shingle_roof", + "count": 6 + } + } + } + ] +} \ No newline at end of file