feat: add Skill Gem Block and related recipes (by @PhantomDergwulf)

Franco227 · Jul 6, 2024 · 24fb5b3 · 24fb5b3
1 parent 4e0d0b5
commit 24fb5b3
Show file tree

Hide file tree

Showing 147 changed files with 258 additions and 10 deletions.
diff --git a/...t/advancements/recipes/blast_furnace.json → ...uecraft/advancements/recipes/furnace.json b/...t/advancements/recipes/blast_furnace.json → ...uecraft/advancements/recipes/furnace.json
diff --git a/...ft/advancements/recipes/copper_block.json → ...dvancements/recipes/raw_copper_block.json b/...ft/advancements/recipes/copper_block.json → ...dvancements/recipes/raw_copper_block.json
diff --git a/...raft/advancements/recipes/gold_block.json → .../advancements/recipes/raw_gold_block.json b/...raft/advancements/recipes/gold_block.json → .../advancements/recipes/raw_gold_block.json
diff --git a/...raft/advancements/recipes/iron_block.json → .../advancements/recipes/raw_iron_block.json b/...raft/advancements/recipes/iron_block.json → .../advancements/recipes/raw_iron_block.json
diff --git a/...t/advancements/recipes/skill_point_1.json → ...craft/advancements/recipes/skill_gem.json b/...t/advancements/recipes/skill_point_1.json → ...craft/advancements/recipes/skill_gem.json
@@ -15,7 +15,8 @@
         "recipes": [
             "roguecraft:skillpoint_1",
             "roguecraft:skillpoint_2",
-            "roguecraft:skillpoint_3"
+            "roguecraft:skillpoint_3",
+            "roguecraft:skill_gem_block"
         ]
     }
 }
diff --git a/Data_Pack/data/roguecraft/advancements/recipes/skill_gem_block.json b/Data_Pack/data/roguecraft/advancements/recipes/skill_gem_block.json
@@ -0,0 +1,22 @@
+{
+    "criteria": {
+        "requirement": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [{
+                    "items": [
+                        "minecraft:command_block"
+                    ]
+                }]
+            }
+        }
+    },
+    "rewards": {
+        "recipes": [
+            "roguecraft:skill_gem",
+            "roguecraft:skillpoint_4",
+            "roguecraft:skillpoint_5",
+            "roguecraft:skillpoint_6"
+        ]
+    }
+}
diff --git a/Data_Pack/data/roguecraft/recipes/skill_gem.json b/Data_Pack/data/roguecraft/recipes/skill_gem.json
@@ -0,0 +1,12 @@
+{
+    "type": "minecraft:crafting_shapeless",
+    "ingredients": [
+        {
+            "item": "minecraft:command_block"
+        }
+    ],
+    "result": {
+        "id": "minecraft:structure_block",
+        "count": 9
+    }
+}
diff --git a/Data_Pack/data/roguecraft/recipes/skill_gem_block.json b/Data_Pack/data/roguecraft/recipes/skill_gem_block.json
@@ -0,0 +1,17 @@
+{
+    "type": "minecraft:crafting_shaped",
+    "pattern": [
+        "###",
+        "###",
+        "###"
+    ],
+    "key": {
+        "#": {
+            "item": "minecraft:structure_block"
+        }
+    },
+    "result": {
+        "id": "minecraft:command_block",
+        "count": 1
+    }
+}
diff --git a/Data_Pack/data/roguecraft/recipes/skillpoint_4.json b/Data_Pack/data/roguecraft/recipes/skillpoint_4.json
@@ -0,0 +1,23 @@
+{
+    "type": "minecraft:crafting_shaped",
+    "pattern": [
+        "#i#",
+        "iPi",
+        "#i#"
+    ],
+    "key": {
+        "#": {
+            "item": "minecraft:coal_block"
+        },
+        "i": {
+            "item": "minecraft:copper_block"
+        },
+        "P": {
+            "item": "minecraft:command_block"
+        }
+    },
+    "result": {
+        "id": "minecraft:structure_void",
+        "count": 9
+    }
+}
diff --git a/Data_Pack/data/roguecraft/recipes/skillpoint_5.json b/Data_Pack/data/roguecraft/recipes/skillpoint_5.json
@@ -0,0 +1,23 @@
+{
+    "type": "minecraft:crafting_shaped",
+    "pattern": [
+        "igi",
+        "gPg",
+        "igi"
+    ],
+    "key": {
+        "i": {
+            "item": "minecraft:copper_block"
+        },
+        "g": {
+            "item": "minecraft:gold_block"
+        },
+        "P": {
+            "item": "minecraft:command_block"
+        }
+    },
+    "result": {
+        "id": "minecraft:structure_void",
+        "count": 18
+    }
+}
diff --git a/Data_Pack/data/roguecraft/recipes/skillpoint_6.json b/Data_Pack/data/roguecraft/recipes/skillpoint_6.json
@@ -0,0 +1,23 @@
+{
+    "type": "minecraft:crafting_shaped",
+    "pattern": [
+        "gDg",
+        "DPD",
+        "gDg"
+    ],
+    "key": {
+        "g": {
+            "item": "minecraft:gold_block"
+        },
+        "D": {
+            "item": "minecraft:diamond_block"
+        },
+        "P": {
+            "item": "minecraft:command_block"
+        }
+    },
+    "result": {
+        "id": "minecraft:structure_void",
+        "count": 36
+    }
+}
diff --git a/Data_Pack/pack.mcmeta b/Data_Pack/pack.mcmeta
@@ -1,8 +1,8 @@
 {
 	"pack": {
-        	"pack_format": 26,
-        	"supported_formats": {"min_inclusive": 26, "max_inclusive": 26},
-        	"description": "Made by MonoCode"
+        "pack_format": 41,
+        "supported_formats": {"min_inclusive": 26, "max_inclusive": 41},
+        "description": "Made by MonoCode"
 	},
     "filter": {
         "block": [
@@ -179,5 +179,5 @@
                 "path": "recipes/wooden_sword"
             }
         ]
-	}
+    }
 }
diff --git a/README.md b/README.md
@@ -11,8 +11,8 @@ You can join the MonoCode's Discord server [here](https://discord.gg/d5FxfTYUqQ)
 - `v1.2.4.1`: **Experience Orbs do not get cleared on End reset.**
 - `v1.2.4.1`: **Players are not properly healed when starting a run.**
 ## Additions
-- `v1.2.4.2`: **Recipes for smelting/blasting Raw Copper Block, Raw Iron Block and Raw Gold Block.**
-- `v1.2.4.2`: **Skill Gem Block and related recipes (by [PhantomDergwulf](https://github.com/PhantomDergwulf)).**
+- `v1.2.4.1`: **Recipes for smelting/blasting Raw Copper Block, Raw Iron Block and Raw Gold Block.**
+- `v1.2.4.1`: **Skill Gem Block and related recipes (by [PhantomDergwulf](https://github.com/PhantomDergwulf)).**
 
 
 # Contributing

diff --git a/Resource_Pack/assets/minecraft/lang/af_za.json b/Resource_Pack/assets/minecraft/lang/af_za.json
@@ -2,6 +2,7 @@
   "enchantment.level.0": "0",
   "block.minecraft.structure_void": "Skillpoint",
   "block.minecraft.structure_block": "Skill Gem",
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Loadout",
 
   "roguecraft.generic.loadout": "Loadout",

diff --git a/Resource_Pack/assets/minecraft/lang/ar_sa.json b/Resource_Pack/assets/minecraft/lang/ar_sa.json
@@ -2,6 +2,7 @@
   "enchantment.level.0": "0",
   "block.minecraft.structure_void": "Skillpoint",
   "block.minecraft.structure_block": "Skill Gem",
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Loadout",
 
   "roguecraft.generic.loadout": "Loadout",

diff --git a/Resource_Pack/assets/minecraft/lang/ast_es.json b/Resource_Pack/assets/minecraft/lang/ast_es.json
@@ -2,6 +2,7 @@
   "enchantment.level.0": "0",
   "block.minecraft.structure_void": "Skillpoint",
   "block.minecraft.structure_block": "Skill Gem",
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Loadout",
 
   "roguecraft.generic.loadout": "Loadout",

diff --git a/Resource_Pack/assets/minecraft/lang/az_az.json b/Resource_Pack/assets/minecraft/lang/az_az.json
@@ -2,6 +2,7 @@
   "enchantment.level.0": "0",
   "block.minecraft.structure_void": "Skillpoint",
   "block.minecraft.structure_block": "Skill Gem",
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Loadout",
 
   "roguecraft.generic.loadout": "Loadout",

diff --git a/Resource_Pack/assets/minecraft/lang/ba_ru.json b/Resource_Pack/assets/minecraft/lang/ba_ru.json
@@ -2,6 +2,7 @@
   "enchantment.level.0": "0",
   "block.minecraft.structure_void": "Skillpoint",
   "block.minecraft.structure_block": "Skill Gem",
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Loadout",
 
   "roguecraft.generic.loadout": "Loadout",

diff --git a/Resource_Pack/assets/minecraft/lang/bar.json b/Resource_Pack/assets/minecraft/lang/bar.json
@@ -2,6 +2,7 @@
   "enchantment.level.0": "0",
   "block.minecraft.structure_void": "Skillpoint",
   "block.minecraft.structure_block": "Skill Gem",
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Loadout",
 
   "roguecraft.generic.loadout": "Loadout",

diff --git a/Resource_Pack/assets/minecraft/lang/be_by.json b/Resource_Pack/assets/minecraft/lang/be_by.json
@@ -2,6 +2,7 @@
   "enchantment.level.0": "0",
   "block.minecraft.structure_void": "Skillpoint",
   "block.minecraft.structure_block": "Skill Gem",
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Loadout",
 
   "roguecraft.generic.loadout": "Loadout",

diff --git a/Resource_Pack/assets/minecraft/lang/bec_it.json b/Resource_Pack/assets/minecraft/lang/bec_it.json
@@ -2,6 +2,7 @@
   "enchantment.level.0": "0",
   "block.minecraft.structure_void": "Skillpoint",
   "block.minecraft.structure_block": "Skill Gem",
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Loadout",
 
   "roguecraft.generic.loadout": "Loadout",

diff --git a/Resource_Pack/assets/minecraft/lang/bg_bg.json b/Resource_Pack/assets/minecraft/lang/bg_bg.json
@@ -2,6 +2,7 @@
   "enchantment.level.0": "0",
   "block.minecraft.structure_void": "Skillpoint",
   "block.minecraft.structure_block": "Skill Gem",
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Loadout",
 
   "roguecraft.generic.loadout": "Loadout",

diff --git a/Resource_Pack/assets/minecraft/lang/br_fr.json b/Resource_Pack/assets/minecraft/lang/br_fr.json
@@ -2,6 +2,7 @@
   "enchantment.level.0": "0",
   "block.minecraft.structure_void": "Skillpoint",
   "block.minecraft.structure_block": "Skill Gem",
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Loadout",
 
   "roguecraft.generic.loadout": "Loadout",

diff --git a/Resource_Pack/assets/minecraft/lang/brb.json b/Resource_Pack/assets/minecraft/lang/brb.json
@@ -2,6 +2,7 @@
   "enchantment.level.0": "0",
   "block.minecraft.structure_void": "Skillpoint",
   "block.minecraft.structure_block": "Skill Gem",
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Loadout",
 
   "roguecraft.generic.loadout": "Loadout",

diff --git a/Resource_Pack/assets/minecraft/lang/bs_ba.json b/Resource_Pack/assets/minecraft/lang/bs_ba.json
@@ -2,6 +2,7 @@
   "enchantment.level.0": "0",
   "block.minecraft.structure_void": "Skillpoint",
   "block.minecraft.structure_block": "Skill Gem",
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Loadout",
 
   "roguecraft.generic.loadout": "Loadout",

diff --git a/Resource_Pack/assets/minecraft/lang/ca_es.json b/Resource_Pack/assets/minecraft/lang/ca_es.json
@@ -2,6 +2,7 @@
   "enchantment.level.0": "0",
   "block.minecraft.structure_void": "Skillpoint",
   "block.minecraft.structure_block": "Skill Gem",
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Loadout",
 
   "roguecraft.generic.loadout": "Loadout",

diff --git a/Resource_Pack/assets/minecraft/lang/cs_cz.json b/Resource_Pack/assets/minecraft/lang/cs_cz.json
@@ -2,6 +2,7 @@
   "enchantment.level.0": "0",
   "block.minecraft.structure_void": "Skillpoint",
   "block.minecraft.structure_block": "Skill Gem",
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Loadout",
 
   "roguecraft.generic.loadout": "Loadout",

diff --git a/Resource_Pack/assets/minecraft/lang/cy_gb.json b/Resource_Pack/assets/minecraft/lang/cy_gb.json
@@ -2,6 +2,7 @@
   "enchantment.level.0": "0",
   "block.minecraft.structure_void": "Skillpoint",
   "block.minecraft.structure_block": "Skill Gem",
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Loadout",
 
   "roguecraft.generic.loadout": "Loadout",

diff --git a/Resource_Pack/assets/minecraft/lang/da_dk.json b/Resource_Pack/assets/minecraft/lang/da_dk.json
@@ -195,7 +195,7 @@
 
 
 
-
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Loadout",
 
   "roguecraft.generic.loadout": "Loadout",

diff --git a/Resource_Pack/assets/minecraft/lang/de_at.json b/Resource_Pack/assets/minecraft/lang/de_at.json
@@ -2,6 +2,7 @@
   "enchantment.level.0": "0",
   "block.minecraft.structure_void": "Skillpoint",
   "block.minecraft.structure_block": "Skill Gem",
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Loadout",
 
   "roguecraft.generic.loadout": "Loadout",

diff --git a/Resource_Pack/assets/minecraft/lang/de_ch.json b/Resource_Pack/assets/minecraft/lang/de_ch.json
@@ -2,6 +2,7 @@
   "enchantment.level.0": "0",
   "block.minecraft.structure_void": "Skillpoint",
   "block.minecraft.structure_block": "Skill Gem",
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Loadout",
 
   "roguecraft.generic.loadout": "Loadout",

diff --git a/Resource_Pack/assets/minecraft/lang/de_de.json b/Resource_Pack/assets/minecraft/lang/de_de.json
@@ -2,6 +2,7 @@
   "enchantment.level.0": "0",
   "block.minecraft.structure_void": "Fähigkeitspunkt",
   "block.minecraft.structure_block": "Fähigkeitsperle",
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Ausstattung",
 
 

diff --git a/Resource_Pack/assets/minecraft/lang/el_gr.json b/Resource_Pack/assets/minecraft/lang/el_gr.json
@@ -2,6 +2,7 @@
   "enchantment.level.0": "0",
   "block.minecraft.structure_void": "Skillpoint",
   "block.minecraft.structure_block": "Skill Gem",
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Loadout",
 
   "roguecraft.generic.loadout": "Loadout",

diff --git a/Resource_Pack/assets/minecraft/lang/en_au.json b/Resource_Pack/assets/minecraft/lang/en_au.json
@@ -2,6 +2,7 @@
   "enchantment.level.0": "0",
   "block.minecraft.structure_void": "Skillpoint",
   "block.minecraft.structure_block": "Skill Gem",
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Loadout",
 
   "roguecraft.generic.loadout": "Loadout",

diff --git a/Resource_Pack/assets/minecraft/lang/en_ca.json b/Resource_Pack/assets/minecraft/lang/en_ca.json
@@ -2,6 +2,7 @@
   "enchantment.level.0": "0",
   "block.minecraft.structure_void": "Skillpoint",
   "block.minecraft.structure_block": "Skill Gem",
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Loadout",
 
   "roguecraft.generic.loadout": "Loadout",

diff --git a/Resource_Pack/assets/minecraft/lang/en_gb.json b/Resource_Pack/assets/minecraft/lang/en_gb.json
@@ -2,6 +2,7 @@
   "enchantment.level.0": "0",
   "block.minecraft.structure_void": "Skillpoint",
   "block.minecraft.structure_block": "Skill Gem",
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Loadout",
 
   "roguecraft.generic.loadout": "Loadout",

diff --git a/Resource_Pack/assets/minecraft/lang/en_nz.json b/Resource_Pack/assets/minecraft/lang/en_nz.json
@@ -2,6 +2,7 @@
   "enchantment.level.0": "0",
   "block.minecraft.structure_void": "Skillpoint",
   "block.minecraft.structure_block": "Skill Gem",
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Loadout",
 
   "roguecraft.generic.loadout": "Loadout",

diff --git a/Resource_Pack/assets/minecraft/lang/en_pt.json b/Resource_Pack/assets/minecraft/lang/en_pt.json
@@ -2,6 +2,7 @@
   "enchantment.level.0": "0",
   "block.minecraft.structure_void": "Skillpoint",
   "block.minecraft.structure_block": "Skill Gem",
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Loadout",
 
   "roguecraft.generic.loadout": "Loadout",

diff --git a/Resource_Pack/assets/minecraft/lang/en_ud.json b/Resource_Pack/assets/minecraft/lang/en_ud.json
@@ -2,6 +2,7 @@
   "enchantment.level.0": "0",
   "block.minecraft.structure_void": "Skillpoint",
   "block.minecraft.structure_block": "Skill Gem",
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Loadout",
 
   "roguecraft.generic.loadout": "Loadout",

diff --git a/Resource_Pack/assets/minecraft/lang/en_us.json b/Resource_Pack/assets/minecraft/lang/en_us.json
@@ -2,6 +2,7 @@
   "enchantment.level.0": "0",
   "block.minecraft.structure_void": "Skillpoint",
   "block.minecraft.structure_block": "Skill Gem",
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Loadout",
 
   "roguecraft.generic.loadout": "Loadout",

diff --git a/Resource_Pack/assets/minecraft/lang/enp.json b/Resource_Pack/assets/minecraft/lang/enp.json
@@ -2,6 +2,7 @@
   "enchantment.level.0": "0",
   "block.minecraft.structure_void": "Skillpoint",
   "block.minecraft.structure_block": "Skill Gem",
+  "block.minecraft.command_block": "Skill Gem Block",
   "container.enderchest": "\uEff2\uF80A    Loadout",
 
   "roguecraft.generic.loadout": "Loadout",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -195,7 +195,7 @@




		"block.minecraft.command_block": "Skill Gem Block",
		"container.enderchest": "\uEff2\uF80A Loadout",

		"roguecraft.generic.loadout": "Loadout",
Expand Down