Merge branch 'update_1.8' into 1.16

2025-04-21 00:50:04 +02:00 · 2021-03-14 22:53:09 +01:00 · 2021-03-14 22:50:53 +01:00 · 2021-03-14 20:48:00 +01:00 · 2021-03-14 20:36:48 +01:00 · 2021-03-14 20:20:13 +01:00
6 changed files with 15 additions and 11 deletions
--- 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 {
--- 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
--- 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()) {
--- 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;

--- 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;
--- 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"
Author	SHA1	Message	Date
Theta-Dev	76bc97b561	Merge branch 'update_1.8' into 1.16	2021-03-14 22:53:09 +01:00
Theta-Dev	098fc0e693	Merge branch 'update_1.8' into 1.16	2021-03-14 22:50:53 +01:00
Theta-Dev	db99c8e142	Merge branch 'update_1.8' into 1.16	2021-03-14 20:48:00 +01:00
Theta-Dev	00f0e51491	Merge branch 'update_1.8' into 1.16	2021-03-14 20:36:48 +01:00
Theta-Dev	1cb42f0740	Merge remote-tracking branch 'origin/update_1.8' into 1.16	2021-03-14 20:20:13 +01:00
Theta-Dev	f4a0423b52	Merged Update 2.0 into 1.16	2021-03-14 19:22:59 +01:00
Theta-Dev	e4b3421324	Added TE White/Blacklist Now triggers onBlockPlacedBy() Fixed SecurityCraft bug	2020-12-06 18:40:39 +01:00
Theta-Dev	a10a10e668	Fixed typo	2020-11-06 15:59:26 +01:00
Theta-Dev	6bb38b43c6	Updated mod to V1.6 Added MC 1.16.4 support Better direction lock descriptions Removed stray English words in German translation # Conflicts: # gradle.properties # src/main/resources/META-INF/mods.toml	2020-11-06 15:56:19 +01:00
ThetaDev	c16d1d22ac	Merge pull request #25 from Theta-Dev/update_1.5 Update 1.5 -> 1.16.1	2020-09-29 22:47:39 +02:00
ThetaDev	b848742f90	Merge branch '1.16' into update_1.5	2020-09-29 22:47:29 +02:00
Theta-Dev	3aee9629df	Fixed stack overflow when placing many connecting blocks (1.16)	2020-09-18 22:29:53 +02:00
Theta-Dev	40a4df7a20	Changed readme	2020-09-18 13:06:12 +02:00
Theta-Dev	7b291d514f	Changed botania version	2020-09-18 00:20:09 +02:00
ThetaDev	0d90de89cf	Removed duplicate forge declaration	2020-09-17 23:26:40 +02:00
Theta-Dev	9aec266dd2	Set mc/forge version	2020-09-17 23:17:02 +02:00
ThetaDev	0ca8f23b69	Merge pull request #21 from Theta-Dev/update1.3 Update1.3 -> 1.16	2020-09-17 23:03:50 +02:00
ThetaDev	e4ca89680d	Merge branch '1.16' into update1.3	2020-09-17 23:03:42 +02:00
Theta-Dev	d87c7f7d1b	fix exception with no-collision blocks	2020-08-27 00:10:38 +02:00
ThetaDev	20b016dd57	Merge pull request #17 from Theta-Dev/fix_collision Fix collision	2020-08-26 23:51:57 +02:00
ThetaDev	95d3c504ba	Merge branch '1.16' into fix_collision	2020-08-26 23:51:47 +02:00
Theta-Dev	1186043bf3	placement dir improvements	2020-08-26 17:18:54 +02:00