diff --git a/build.gradle b/build.gradle index b5bf3e0..f73ddd8 100644 --- a/build.gradle +++ b/build.gradle @@ -29,6 +29,18 @@ dependencies { // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs. // You may need to force-disable transitiveness on them. + + // for special leaves blocks like ExtendedLeavesBlock + modImplementation "com.terraformersmc.terraform-api:terraform-wood-api-v1:${project.terraform_wood_api_version}" + repositories { + maven { + name = 'TerraformersMC' + url = 'https://maven.terraformersmc.com/' + } + maven { + url = 'https://maven.minecraftforge.net/' + } + } } processResources { diff --git a/gradle.properties b/gradle.properties index 4d8825c..3194692 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,9 +9,12 @@ loader_version=0.14.11 # Mod Properties - mod_version = 1.19.3.2 + mod_version = 1.19.3.3 maven_group = de.jottyfan.minecraft archives_base_name = quickiefabric # Dependencies fabric_version=0.69.1+1.19.3 + +# for ExtendedLeavesBlock + terraform_wood_api_version=5.0.0-beta.1 diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/QuickieFabric.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/QuickieFabric.java index 5a8f2e3..018915f 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/QuickieFabric.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/QuickieFabric.java @@ -20,5 +20,6 @@ public class QuickieFabric implements ModInitializer { RegistryManager.registerFeatures(); RegistryManager.registerContainer(); RegistryManager.registerLootings(); + RegistryManager.registerTags(); } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/help/ClassHelper.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/help/ClassHelper.java deleted file mode 100644 index 3b91f50..0000000 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/help/ClassHelper.java +++ /dev/null @@ -1,27 +0,0 @@ -package de.jottyfan.minecraft.quickiefabric.help; - -/** - * - * @author jotty - * - */ -public class ClassHelper { - - /** - * check if c is instance of name - * - * @param c the class - * @param name the name - * @return true or false - */ - public static final Boolean isInstanceOf(Class c, String name) { - Class[] a = c.getInterfaces(); - for (Class cl : a) { - String simpleName = cl.getSimpleName(); - if (simpleName.equals(name)) { - return true; - } - } - return false; - } -} diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java index 20328d2..f1dc2e6 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java @@ -42,6 +42,8 @@ import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.tag.TagKey; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.text.Text; import net.minecraft.util.ActionResult; @@ -290,4 +292,7 @@ public class RegistryManager { || id.equals(new Identifier("blocks/tall_grass")); } + public final static void registerTags() { + TagKey BLOCKSTACKER = TagKey.of(RegistryKeys.ITEM, new Identifier(QUICKIEFABRIC, "blockstacker")); + } } diff --git a/src/main/resources/assets/quickiefabric/textures/item/salpeter.png b/src/main/resources/assets/quickiefabric/textures/item/salpeter.png index b1d3597..cd765cc 100644 Binary files a/src/main/resources/assets/quickiefabric/textures/item/salpeter.png and b/src/main/resources/assets/quickiefabric/textures/item/salpeter.png differ diff --git a/src/main/resources/assets/quickiefabric/textures/item/sulphor.png b/src/main/resources/assets/quickiefabric/textures/item/sulphor.png index db3ee45..8dc98aa 100644 Binary files a/src/main/resources/assets/quickiefabric/textures/item/sulphor.png and b/src/main/resources/assets/quickiefabric/textures/item/sulphor.png differ diff --git a/src/main/resources/data/minecraft/tags/blocks/blockstacker.json b/src/main/resources/data/minecraft/tags/blocks/blockstacker.json new file mode 100644 index 0000000..d23f8b5 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/blockstacker.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "quickiefabric:blockstackereast", + "quickiefabric:blockstackersouth", + "quickiefabric:blockstackerwest", + "quickiefabric:blockstackernorth", + "quickiefabric:blockstackerup", + "quickiefabric:blockstackerdown" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/recipes/blockstackerdown.json b/src/main/resources/data/quickiefabric/recipes/blockstacker.json similarity index 100% rename from src/main/resources/data/quickiefabric/recipes/blockstackerdown.json rename to src/main/resources/data/quickiefabric/recipes/blockstacker.json diff --git a/src/test/java/de/jottyfan/minecraft/quickiefabric/help/TestClassHelper.java b/src/test/java/de/jottyfan/minecraft/quickiefabric/help/TestClassHelper.java deleted file mode 100644 index 48b893c..0000000 --- a/src/test/java/de/jottyfan/minecraft/quickiefabric/help/TestClassHelper.java +++ /dev/null @@ -1,25 +0,0 @@ -package de.jottyfan.minecraft.quickiefabric.help; - -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.HashMap; - -import org.junit.Test; - -/** - * - * @author jotty - * - */ -public class TestClassHelper { - - @Test - public void testIsInstanceOf() { - assertTrue(ClassHelper.isInstanceOf(new HashMap().getClass(), "Cloneable")); - assertTrue(ClassHelper.isInstanceOf(new HashMap().getClass(), "Map")); - assertTrue(ClassHelper.isInstanceOf(new HashMap().getClass(), "Serializable")); - assertTrue(ClassHelper.isInstanceOf(HashMap.class, "Cloneable")); - assertTrue(ClassHelper.isInstanceOf(HashMap.class, "Map")); - assertTrue(ClassHelper.isInstanceOf(HashMap.class, "Serializable")); - } -}