Merge pull request #3 from Lufurrius/main

More Treated Wood Compat

gradle.properties

@@ -10,7 +10,7 @@ yarn_mappings=1.21+build.2
 loader_version=0.15.11
 
 # Mod Properties
-mod_version=1.1.0
+mod_version=1.1.1
 maven_group=com.lumiscosity.rounded
 archives_base_name=rounded
 

src/client/resources/assets/rounded/blockstates/compat/charm/treated_azalea_planks.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "rounded:block/compat/charm/treated_azalea_planks"
+    }
+  }
+}

src/client/resources/assets/rounded/blockstates/compat/charm/treated_ebony_planks.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "rounded:block/compat/charm/treated_ebony_planks"
+    }
+  }
+}

src/client/resources/assets/rounded/blockstates/compat/gardens_of_the_dead/treated_soulblight_planks.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "rounded:block/compat/gardens_of_the_dead/treated_soulblight_planks"
+    }
+  }
+}

src/client/resources/assets/rounded/blockstates/compat/gardens_of_the_dead/treated_whistlecane_planks.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "rounded:block/compat/gardens_of_the_dead/treated_whistlecane_planks"
+    }
+  }
+}

src/client/resources/assets/rounded/blockstates/compat/pearfection/treated_callery_planks.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "rounded:block/compat/pearfection/treated_callery_planks"
+    }
+  }
+}

src/client/resources/assets/rounded/blockstates/compat/verdance/treated_mulberry_planks.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "rounded:block/compat/verdance/treated_mulberry_planks"
+    }
+  }
+}

src/client/resources/assets/rounded/lang/en_us.json

@@ -90,5 +90,12 @@
   "block.rounded.compat.wilderwild.treated_palm_planks": "Treated Palm Planks",
   "block.rounded.compat.betternether.treated_wart_planks": "Treated Wart Planks",
   "block.rounded.compat.betternether.treated_willow_planks": "Treated Willow Planks",
-  "block.rounded.compat.terrestria.treated_yucca_palm_planks": "Treated Yucca Palm Planks"
+  "block.rounded.compat.terrestria.treated_yucca_palm_planks": "Treated Yucca Palm Planks",
+
+  "block.rounded.compat.charm.treated_ebony_planks": "Treated Ebony Planks",
+  "block.rounded.compat.charm.treated_azalea_planks": "Treated Azalea Planks",
+  "block.rounded.compat.gardens_of_the_dead.treated_whistlecane_planks": "Treated Whistlecane Planks",
+  "block.rounded.compat.gardens_of_the_dead.treated_soulblight_planks": "Treated Soulblight Planks",
+  "block.rounded.compat.verdance.treated_mulberry_planks": "Treated Mulberry Planks",
+  "block.rounded.compat.pearfection.treated_callery_planks": "Treated Callery Planks"
 }

src/client/resources/assets/rounded/models/block/compat/charm/treated_azalea_planks.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "rounded:block/compat/charm/treated_azalea_planks"
+  }
+}

src/client/resources/assets/rounded/models/block/compat/charm/treated_ebony_planks.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "rounded:block/compat/charm/treated_ebony_planks"
+  }
+}

src/client/resources/assets/rounded/models/block/compat/gardens_of_the_dead/treated_soulblight_planks.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "rounded:block/compat/gardens_of_the_dead/treated_soulblight_planks"
+  }
+}

src/client/resources/assets/rounded/models/block/compat/gardens_of_the_dead/treated_whistlecane_planks.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "rounded:block/compat/gardens_of_the_dead/treated_whistlecane_planks"
+  }
+}

src/client/resources/assets/rounded/models/block/compat/pearfection/treated_callery_planks.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "rounded:block/compat/pearfection/treated_callery_planks"
+  }
+}

src/client/resources/assets/rounded/models/block/compat/verdance/treated_mulberry_planks.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "rounded:block/compat/verdance/treated_mulberry_planks"
+  }
+}

src/client/resources/assets/rounded/models/item/compat/charm/treated_azalea_planks.json

@@ -0,0 +1,3 @@
+{
+  "parent": "rounded:block/compat/charm/treated_azalea_planks"
+}

src/client/resources/assets/rounded/models/item/compat/charm/treated_ebony_planks.json

@@ -0,0 +1,3 @@
+{
+  "parent": "rounded:block/compat/charm/treated_ebony_planks"
+}

src/client/resources/assets/rounded/models/item/compat/gardens_of_the_dead/treated_soulblight_planks.json

@@ -0,0 +1,3 @@
+{
+  "parent": "rounded:block/compat/gardens_of_the_dead/treated_soulblight_planks"
+}

src/client/resources/assets/rounded/models/item/compat/gardens_of_the_dead/treated_whistlecane_planks.json

@@ -0,0 +1,3 @@
+{
+  "parent": "rounded:block/compat/gardens_of_the_dead/treated_whistlecane_planks"
+}

src/client/resources/assets/rounded/models/item/compat/pearfection/treated_callery_planks.json

@@ -0,0 +1,3 @@
+{
+  "parent": "rounded:block/compat/pearfection/treated_callery_planks"
+}

src/client/resources/assets/rounded/models/item/compat/verdance/treated_mulberry_planks.json

@@ -0,0 +1,3 @@
+{
+  "parent": "rounded:block/compat/verdance/treated_mulberry_planks"
+}

src/main/java/com/lumiscosity/rounded/Rounded.java

@@ -48,6 +48,18 @@ public void onInitialize() {
 		if (FabricLoader.getInstance().isModLoaded("wilderwild")) {
 			WilderwildCompat.register();
 		}
+		if (FabricLoader.getInstance().isModLoaded("gardens_of_the_dead")) {
+			GardensofthedeadCompat.register();
+		}
+		if (FabricLoader.getInstance().isModLoaded("pearfection")) {
+			PearfectionCompat.register();
+		}
+		if (FabricLoader.getInstance().isModLoaded("verdance")) {
+			VerdanceCompat.register();
+		}
+		if (FabricLoader.getInstance().isModLoaded("charm")) {
+			CharmCompat.register();
+		}
 
 		LOGGER.info("Rounded init complete!");
 	}

src/main/java/com/lumiscosity/rounded/compat/CharmCompat.java

@@ -0,0 +1,28 @@
+package com.lumiscosity.rounded.compat;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.BlockItem;
+import net.minecraft.item.Item;
+import net.minecraft.registry.Registries;
+import net.minecraft.util.Identifier;
+
+import static com.lumiscosity.rounded.blocks.RegisterBlocks.register_treated_plank;
+
+public class CharmCompat {
+    public static final Block TREATED_EBONY_PLANKS = new Block(
+            Block.Settings.copy(Registries.BLOCK.get(Identifier.of("charm", "ebony_planks")))
+    );
+    public static final Item TREATED_EBONY_PLANKS_ITEM = new BlockItem(TREATED_EBONY_PLANKS, new Item.Settings());
+
+    public static final Block TREATED_AZALEA_PLANKS = new Block(
+            Block.Settings.copy(Registries.BLOCK.get(Identifier.of("charm", "azalea_planks")))
+    );
+    public static final Item TREATED_AZALEA_PLANKS_ITEM = new BlockItem(TREATED_AZALEA_PLANKS, new Item.Settings());
+
+
+    public static void register() {
+        register_treated_plank("compat/charm/treated_ebony_planks", TREATED_EBONY_PLANKS, TREATED_EBONY_PLANKS_ITEM, "charm", "ebony");
+        register_treated_plank("compat/charm/treated_azalea_planks", TREATED_AZALEA_PLANKS, TREATED_AZALEA_PLANKS_ITEM, "charm", "azalea");
+
+    }
+}

src/main/java/com/lumiscosity/rounded/compat/GardensofthedeadCompat.java

@@ -0,0 +1,28 @@
+package com.lumiscosity.rounded.compat;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.BlockItem;
+import net.minecraft.item.Item;
+import net.minecraft.registry.Registries;
+import net.minecraft.util.Identifier;
+
+import static com.lumiscosity.rounded.blocks.RegisterBlocks.register_treated_plank;
+
+public class GardensofthedeadCompat {
+    public static final Block TREATED_SOULBLIGHT_PLANKS = new Block(
+            Block.Settings.copy(Registries.BLOCK.get(Identifier.of("gardens_of_the_dead", "soulblight_planks")))
+    );
+    public static final Item TREATED_SOULBLIGHT_PLANKS_ITEM = new BlockItem(TREATED_SOULBLIGHT_PLANKS, new Item.Settings());
+
+    public static final Block TREATED_WHISTLECANE_PLANKS = new Block(
+            Block.Settings.copy(Registries.BLOCK.get(Identifier.of("gardens_of_the_dead", "whistlecane_planks")))
+    );
+    public static final Item TREATED_WHISTLECANE_PLANKS_ITEM = new BlockItem(TREATED_WHISTLECANE_PLANKS, new Item.Settings());
+
+
+    public static void register() {
+        register_treated_plank("compat/gardens_of_the_dead/treated_soulblight_planks", TREATED_SOULBLIGHT_PLANKS, TREATED_SOULBLIGHT_PLANKS_ITEM, "gardens_of_the_dead", "soulblight");
+        register_treated_plank("compat/gardens_of_the_dead/treated_whistlecane_planks", TREATED_WHISTLECANE_PLANKS, TREATED_WHISTLECANE_PLANKS_ITEM, "gardens_of_the_dead", "whistlecane");
+
+    }
+}

src/main/java/com/lumiscosity/rounded/compat/PearfectionCompat.java

@@ -0,0 +1,21 @@
+package com.lumiscosity.rounded.compat;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.BlockItem;
+import net.minecraft.item.Item;
+import net.minecraft.registry.Registries;
+import net.minecraft.util.Identifier;
+
+import static com.lumiscosity.rounded.blocks.RegisterBlocks.register_treated_plank;
+
+public class PearfectionCompat {
+    public static final Block TREATED_CALLERY_PLANKS = new Block(
+            Block.Settings.copy(Registries.BLOCK.get(Identifier.of("pearfection", "callery_planks")))
+    );
+    public static final Item TREATED_CALLERY_PLANKS_ITEM = new BlockItem(TREATED_CALLERY_PLANKS, new Item.Settings());
+
+    public static void register() {
+        register_treated_plank("compat/pearfection/treated_callery_planks", TREATED_CALLERY_PLANKS, TREATED_CALLERY_PLANKS_ITEM, "pearfection", "callery");
+
+    }
+}

src/main/java/com/lumiscosity/rounded/compat/VerdanceCompat.java

@@ -0,0 +1,21 @@
+package com.lumiscosity.rounded.compat;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.BlockItem;
+import net.minecraft.item.Item;
+import net.minecraft.registry.Registries;
+import net.minecraft.util.Identifier;
+
+import static com.lumiscosity.rounded.blocks.RegisterBlocks.register_treated_plank;
+
+public class VerdanceCompat {
+    public static final Block TREATED_MULBERRY_PLANKS = new Block(
+            Block.Settings.copy(Registries.BLOCK.get(Identifier.of("minecraft", "oak_planks")))
+    );
+    public static final Item TREATED_MULBERRY_PLANKS_ITEM = new BlockItem(TREATED_MULBERRY_PLANKS, new Item.Settings());
+
+    public static void register() {
+        register_treated_plank("compat/verdance/treated_mulberry_planks", TREATED_MULBERRY_PLANKS, TREATED_MULBERRY_PLANKS_ITEM, "verdance", "mulberry");
+
+    }
+}

src/main/resources/data/minecraft/tags/block/mineable/axe.json

@@ -200,6 +200,30 @@
     {
       "required": false,
       "id": "rounded:compat/wilderwild/treated_palm_planks"
+    },
+    {
+      "required": false,
+      "id": "rounded:compat/pearfection/treated_callery_planks"
+    },
+    {
+      "required": false,
+      "id": "rounded:compat/verdance/treated_mulberry_planks"
+    },
+    {
+      "required": false,
+      "id": "rounded:compat/charm/treated_ebony_planks"
+    },
+    {
+      "required": false,
+      "id": "rounded:compat/charm/treated_azalea_planks"
+    },
+    {
+      "required": false,
+      "id": "rounded:compat/gardens_of_the_dead/treated_whistlecane_planks"
+    },
+    {
+      "required": false,
+      "id": "rounded:compat/gardens_of_the_dead/treated_soulblight_planks"
     }
   ]
 }

src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json

@@ -12,4 +12,4 @@
     "rounded:bladderwrack_block",
     "rounded:moisture_detector"
   ]
-}
+}

src/main/resources/data/rounded/advancement/recipes/building_blocks/compat/charm/treated_azalea_planks.json

@@ -0,0 +1,40 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_log": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:honeycomb"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "rounded:compat/charm/treated_azalea_planks"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_log"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "rounded:compat/charm/treated_azalea_planks"
+    ]
+  },
+  "fabric:load_conditions": [
+    {
+      "condition": "fabric:all_mods_loaded",
+      "values": [
+        "charm"
+      ]
+    }
+  ]
+}

src/main/resources/data/rounded/advancement/recipes/building_blocks/compat/charm/treated_ebony_planks.json

@@ -0,0 +1,40 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_log": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:honeycomb"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "rounded:compat/charm/treated_ebony_planks"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_log"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "rounded:compat/charm/treated_ebony_planks"
+    ]
+  },
+  "fabric:load_conditions": [
+    {
+      "condition": "fabric:all_mods_loaded",
+      "values": [
+        "charm"
+      ]
+    }
+  ]
+}