diff --git a/build.gradle b/build.gradle index f075063..2065453 100644 --- a/build.gradle +++ b/build.gradle @@ -104,6 +104,10 @@ dependencies { version: "${project.botania}", classifier: "api" ]) + + //runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.16-39") + //runtimeOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.16.1-3.0") + //runtimeOnly fg.deobf("vazkii.botania:Botania:1.16-398") } jar { @@ -137,4 +141,4 @@ publishing { url "file:///${project.projectDir}/mcmodsrepo" } } -} \ No newline at end of file +} diff --git a/gradle.properties b/gradle.properties index 6505f86..b991e4e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,11 +4,11 @@ org.gradle.daemon=false author=thetadev modid=constructionwand -mcversion=1.16.5 -forgeversion=36.0.46 +mcversion=1.16.1 +forgeversion=32.0.108 mcp_mappings=20200723-1.16.1 -botania=1.16.2-405 +botania=1.16-398 version_major=2 -version_minor=0 \ No newline at end of file +version_minor=0 diff --git a/src/main/java/thetadev/constructionwand/basics/WandUtil.java b/src/main/java/thetadev/constructionwand/basics/WandUtil.java index 6f8a2fe..8db349b 100644 --- a/src/main/java/thetadev/constructionwand/basics/WandUtil.java +++ b/src/main/java/thetadev/constructionwand/basics/WandUtil.java @@ -116,7 +116,7 @@ public class WandUtil } // Remove block if placeEvent is canceled - BlockSnapshot snapshot = BlockSnapshot.create(world.func_234923_W_(), world, pos); + BlockSnapshot snapshot = BlockSnapshot.create(world, pos); BlockEvent.EntityPlaceEvent placeEvent = new BlockEvent.EntityPlaceEvent(snapshot, block, player); MinecraftForge.EVENT_BUS.post(placeEvent); if(placeEvent.isCanceled()) { diff --git a/src/main/java/thetadev/constructionwand/data/ItemModelGenerator.java b/src/main/java/thetadev/constructionwand/data/ItemModelGenerator.java index 507bc4b..f1dedbe 100644 --- a/src/main/java/thetadev/constructionwand/data/ItemModelGenerator.java +++ b/src/main/java/thetadev/constructionwand/data/ItemModelGenerator.java @@ -3,8 +3,8 @@ package thetadev.constructionwand.data; import net.minecraft.data.DataGenerator; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; +import net.minecraftforge.client.model.generators.ExistingFileHelper; import net.minecraftforge.client.model.generators.ItemModelProvider; -import net.minecraftforge.common.data.ExistingFileHelper; import thetadev.constructionwand.ConstructionWand; import thetadev.constructionwand.items.ModItems; diff --git a/src/main/java/thetadev/constructionwand/data/ModData.java b/src/main/java/thetadev/constructionwand/data/ModData.java index 45ccd4a..401b5ee 100644 --- a/src/main/java/thetadev/constructionwand/data/ModData.java +++ b/src/main/java/thetadev/constructionwand/data/ModData.java @@ -1,7 +1,7 @@ package thetadev.constructionwand.data; import net.minecraft.data.DataGenerator; -import net.minecraftforge.common.data.ExistingFileHelper; +import net.minecraftforge.client.model.generators.ExistingFileHelper; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.GatherDataEvent; diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index e3238ee..bdf6802 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[33,)" +loaderVersion="[32,)" license="MIT License" [[mods]] modId="constructionwand" @@ -20,12 +20,12 @@ This is my first minecraft mod. May the odds be ever in your favor. [[dependencies.constructionwand]] modId="forge" mandatory=true - versionRange="[33,)" + versionRange="[32,)" ordering="NONE" side="BOTH" [[dependencies.constructionwand]] modId="minecraft" mandatory=true - versionRange="[1.16.2, 1.16.5]" + versionRange="[1.16.1]" ordering="NONE" side="BOTH"