Skip to content

Commit

Permalink
Switch to datagen
Browse files Browse the repository at this point in the history
  • Loading branch information
ExDrill committed Aug 17, 2024
1 parent ee3e277 commit 6a32345
Show file tree
Hide file tree
Showing 40 changed files with 667 additions and 231 deletions.
4 changes: 4 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ base {
archivesName = project.archives_base_name
}

fabricApi {
configureDataGeneration()
}

processResources {
inputs.property "version", project.version

Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ org.gradle.jvmargs=-Xmx1G
org.gradle.parallel=true

# Fabric Properties
mod_id=verdance
minecraft_version=1.21.1
loader_version=0.15.11

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// 1.21.1 2024-08-16T20:34:12.7535516 Guarding/Recipes
f70b28cfd7b66008f81013bdd758e0c0ce54f548 data\guarding\advancement\recipes\tools\netherite_shield_smithing.json
182ad57f9bbeae0ef3ddb8cc541e25d291c1b667 data\guarding\recipe\netherite_shield_smithing.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// 1.21.1 2024-08-16T20:34:12.7535516 Guarding/Tags for minecraft:item
de3c2592e324c222e3837ca75443bf5c42169e42 data\c\tags\item\tools\shield.json
2bcf0095e15e46fd0f6db6b9c4264c1169924451 data\guarding\tags\item\enchantable\shield.json
de3c2592e324c222e3837ca75443bf5c42169e42 data\minecraft\tags\item\enchantable\durability.json
de3c2592e324c222e3837ca75443bf5c42169e42 data\minecraft\tags\item\trimmable_armor.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// 1.21.1 2024-08-16T20:34:12.7515507 Guarding/Advancements
6147e8d55e73d046e534172b57848937fd866aa2 data\guarding\advancement\story\symbolic_shield.json
dcb1bb929a15a25de2cd7429b7365f4a0b486a9d data\guarding\advancement\story\parry_this_you_casual.json
f2491848a40cdd4e61bdf82b5377a1693a66656a data\guarding\advancement\nether\on_guard.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// 1.21.1 2024-08-16T20:34:12.7525514 Guarding/Dynamic Registries
b8c6a7c04eabbe6db6ec48e535a945fd6346f828 data\guarding\enchantment\barbed.json
f513c9cb427129a70fea51f5cf2e97b2b848fbb9 data\guarding\enchantment\pummeling.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// 1.21.1 2024-08-16T20:34:12.7545519 Guarding/Tags for minecraft:enchantment
b258520fde11b3dc5bfecd1066da0f153df95484 data\minecraft\tags\enchantment\non_treasure.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// 1.21.1 2024-08-16T20:34:12.7545519 Guarding/Tags for minecraft:damage_type
f0ee1b9e1756201a9687a340a234b144be639d5e data\guarding\tags\damage_type\no_parry.json
5 changes: 5 additions & 0 deletions src/main/generated/data/c/tags/item/tools/shield.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"guarding:netherite_shield"
]
}
34 changes: 34 additions & 0 deletions src/main/generated/data/guarding/advancement/nether/on_guard.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parent": "minecraft:nether/netherite_armor",
"criteria": {
"netherite_shield": {
"conditions": {
"items": [
{
"items": "guarding:netherite_shield"
}
]
},
"trigger": "minecraft:inventory_changed"
}
},
"display": {
"description": {
"translate": "advancements.guarding.nether.on_guard.desc"
},
"frame": "challenge",
"icon": {
"count": 1,
"id": "guarding:netherite_shield"
},
"title": {
"translate": "advancements.guarding.nether.on_guard"
}
},
"requirements": [
[
"netherite_shield"
]
],
"sends_telemetry_event": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_netherite_ingot": {
"conditions": {
"items": [
{
"items": "minecraft:netherite_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "guarding:netherite_shield_smithing"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_netherite_ingot"
]
],
"rewards": {
"recipes": [
"guarding:netherite_shield_smithing"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"parent": "guarding:story/symbolic_shield",
"criteria": {
"killed_by_parried_arrow": {
"trigger": "guarding:killed_by_parried_arrow"
}
},
"display": {
"description": {
"translate": "advancements.guarding.story.parry_this_you_casual.desc"
},
"frame": "challenge",
"hidden": true,
"icon": {
"count": 1,
"id": "minecraft:shield"
},
"title": {
"translate": "advancements.guarding.story.parry_this_you_casual"
}
},
"requirements": [
[
"killed_by_parried_arrow"
]
],
"sends_telemetry_event": true
}
Original file line number Diff line number Diff line change
@@ -1,36 +1,39 @@
{
"parent": "minecraft:story/deflect_arrow",
"criteria": {
"decorate_shield": {
"conditions": {
"recipe_id": "minecraft:shield_decoration"
},
"trigger": "minecraft:crafter_recipe_crafted"
}
},
"display": {
"description": {
"translate": "advancements.guarding.story.symbolic_shield.desc"
},
"icon": {
"id": "minecraft:shield",
"count": 1,
"components": {
"minecraft:base_color": "blue",
"minecraft:banner_patterns": [
{
"pattern": "minecraft:stripe_center",
"color": "yellow"
}
],
"minecraft:hide_additional_tooltip": {}
}
"minecraft:banner_patterns": [
{
"color": "yellow",
"pattern": "minecraft:stripe_center"
}
],
"minecraft:base_color": "blue",
"minecraft:hide_additional_tooltip": {}
},
"count": 1,
"id": "minecraft:shield"
},
"title": {
"translate": "advancements.guarding.story.symbolic_shield"
},
"description": {
"translate": "advancements.guarding.story.symbolic_shield.desc"
}
},
"parent": "minecraft:story/deflect_arrow",
"criteria": {
"decorate_shield": {
"trigger": "minecraft:recipe_crafted",
"conditions": {
"recipe_id": "minecraft:shield_decoration"
}
}
},
"requirements": [
["decorate_shield"]
]
[
"decorate_shield"
]
],
"sends_telemetry_event": true
}
68 changes: 68 additions & 0 deletions src/main/generated/data/guarding/enchantment/barbed.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{
"anvil_cost": 8,
"description": {
"translate": "enchantment.guarding.barbed"
},
"effects": {
"guarding:shield_blocked": [
{
"affected": "attacker",
"cancel_on_parry": true,
"effect": {
"type": "minecraft:all_of",
"effects": [
{
"type": "minecraft:damage_entity",
"damage_type": "minecraft:thorns",
"max_damage": 3.0,
"min_damage": 3.0
},
{
"type": "minecraft:damage_item",
"amount": 1.0
}
]
},
"requirements": {
"chance": 0.33,
"condition": "minecraft:random_chance"
}
}
],
"guarding:shield_parried": [
{
"affected": "attacker",
"effect": {
"type": "minecraft:all_of",
"effects": [
{
"type": "minecraft:damage_entity",
"damage_type": "minecraft:thorns",
"max_damage": 3.0,
"min_damage": 3.0
},
{
"type": "minecraft:damage_item",
"amount": 1.0
}
]
}
}
]
},
"max_cost": {
"base": 75,
"per_level_above_first": 25
},
"max_level": 1,
"min_cost": {
"base": 25,
"per_level_above_first": 25
},
"slots": [
"mainhand",
"offhand"
],
"supported_items": "#guarding:enchantable/shield",
"weight": 2
}
31 changes: 31 additions & 0 deletions src/main/generated/data/guarding/enchantment/pummeling.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"anvil_cost": 4,
"description": {
"translate": "enchantment.guarding.pummeling"
},
"effects": {
"guarding:shield_knockback": {
"type": "minecraft:add",
"value": {
"type": "minecraft:linear",
"base": 0.15,
"per_level_above_first": 0.15
}
}
},
"max_cost": {
"base": 55,
"per_level_above_first": 8
},
"max_level": 3,
"min_cost": {
"base": 5,
"per_level_above_first": 8
},
"slots": [
"mainhand",
"offhand"
],
"supported_items": "#guarding:enchantable/shield",
"weight": 5
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"item": "minecraft:shield"
},
"result": {
"id": "guarding:netherite_shield",
"count": 1
"count": 1,
"id": "guarding:netherite_shield"
},
"template": {
"item": "minecraft:netherite_upgrade_smithing_template"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"values": [
"#minecraft:is_explosion",
"#minecraft:bypasses_shield"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"values": [
{
"id": "#c:tools/shield",
"required": false
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"values": [
"guarding:barbed",
"guarding:pummeling"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"guarding:netherite_shield"
]
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"replace": false,
"values": [
"guarding:netherite_shield"
]
Expand Down
Loading

0 comments on commit 6a32345

Please sign in to comment.