Merge branch 'update_1.8' into 1.16

Now triggers onBlockPlacedBy()
Fixed SecurityCraft bug

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"
         }
     }
-}
+}

gradle.properties

@@ -4,11 +4,11 @@ org.gradle.daemon=false
 author=thetadev
 modid=constructionwand
 
-mcversion=1.16.5
+mcversion=1.16.1
-forgeversion=36.0.46
+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
+version_minor=0

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()) {

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;
 

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;

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"