diff --git a/content/forgero-compat/src/main/resources/assets/forgero/lang/en_us.json b/content/forgero-compat/src/main/resources/assets/forgero/lang/en_us.json index be5c68ee5..1ed13f5ec 100644 --- a/content/forgero-compat/src/main/resources/assets/forgero/lang/en_us.json +++ b/content/forgero-compat/src/main/resources/assets/forgero/lang/en_us.json @@ -154,6 +154,11 @@ "item.forgero.white_mangrove": "White Mangrove", "item.forgero.witch_hazel": "Witch Hazel", "item.forgero.zelkova": "Zelkova", + "item.forgero.coconut": "Coconut", + "item.forgero.walnut": "Walnut", + "item.forgero.azalea": "Azalea", + "item.forgero.flowering_azalea": "Flowering Azalea", + "item.forgero.seashell": "Seashell", "item.forgero.bear_fur": "Bear Fur", "item.forgero.cattail_fluff": "Cattail Fluff", "item.forgero.glow_goop": "Glow Goop", diff --git a/content/forgero-compat/src/main/resources/assets/forgero/templates/materials/ecologics/azalea.png b/content/forgero-compat/src/main/resources/assets/forgero/templates/materials/ecologics/azalea.png new file mode 100644 index 000000000..ae6a08eaf Binary files /dev/null and b/content/forgero-compat/src/main/resources/assets/forgero/templates/materials/ecologics/azalea.png differ diff --git a/content/forgero-compat/src/main/resources/assets/forgero/templates/materials/ecologics/coconut.png b/content/forgero-compat/src/main/resources/assets/forgero/templates/materials/ecologics/coconut.png new file mode 100644 index 000000000..f52ce0853 Binary files /dev/null and b/content/forgero-compat/src/main/resources/assets/forgero/templates/materials/ecologics/coconut.png differ diff --git a/content/forgero-compat/src/main/resources/assets/forgero/templates/materials/ecologics/flowering_azalea.png b/content/forgero-compat/src/main/resources/assets/forgero/templates/materials/ecologics/flowering_azalea.png new file mode 100644 index 000000000..b18775c37 Binary files /dev/null and b/content/forgero-compat/src/main/resources/assets/forgero/templates/materials/ecologics/flowering_azalea.png differ diff --git a/content/forgero-compat/src/main/resources/assets/forgero/templates/materials/ecologics/seashell.png b/content/forgero-compat/src/main/resources/assets/forgero/templates/materials/ecologics/seashell.png new file mode 100644 index 000000000..12982bb78 Binary files /dev/null and b/content/forgero-compat/src/main/resources/assets/forgero/templates/materials/ecologics/seashell.png differ diff --git a/content/forgero-compat/src/main/resources/assets/forgero/templates/materials/ecologics/walnut.png b/content/forgero-compat/src/main/resources/assets/forgero/templates/materials/ecologics/walnut.png new file mode 100644 index 000000000..c26c2ee84 Binary files /dev/null and b/content/forgero-compat/src/main/resources/assets/forgero/templates/materials/ecologics/walnut.png differ diff --git a/content/forgero-compat/src/main/resources/data/forgero/packs/ecologics/default.json b/content/forgero-compat/src/main/resources/data/forgero/packs/ecologics/default.json new file mode 100644 index 000000000..aa4934270 --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/packs/ecologics/default.json @@ -0,0 +1,3 @@ +{ + "namespace": "ecologics" +} diff --git a/content/forgero-compat/src/main/resources/data/forgero/packs/ecologics/material/azalea.json b/content/forgero-compat/src/main/resources/data/forgero/packs/ecologics/material/azalea.json new file mode 100644 index 000000000..e74415ae1 --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/packs/ecologics/material/azalea.json @@ -0,0 +1,78 @@ +{ + "type": "WOOD", + "name": "azalea", + "parent": "wood_base", + "container": { + "type": "HOST", + "id": "ecologics:azalea_planks" + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "order": "BASE", + "operation": "ADDITION", + "attributes": [ + { + "id": "wood-durability-composite", + "type": "DURABILITY", + "value": 75 + }, + { + "id": "wood-rarity-composite", + "type": "RARITY", + "value": 20 + }, + { + "id": "wood-weight-composite", + "type": "WEIGHT", + "value": 15 + }, + { + "id": "wood-draw_speed-composite", + "type": "forgero:draw_speed", + "value": 1.3 + }, + { + "id": "wood-draw_power-composite", + "type": "forgero:draw_power", + "value": 3.15 + } + ] + }, + { + "context": "UPGRADE", + "attributes": [ + { + "id": "wood-rarity-upgrade", + "type": "RARITY", + "order": "BASE", + "operation": "ADDITION", + "category": "ALL", + "value": 10 + }, + { + "id": "wood-weight-upgrade", + "type": "WEIGHT", + "order": "BASE", + "operation": "ADDITION", + "category": "ALL", + "value": 7.5 + }, + { + "id": "wood-durability-offensive-upgrade", + "type": "DURABILITY", + "operation": "ADDITION", + "category": "OFFENSIVE", + "value": 37 + } + ] + } + ], + "attributes": [ + ] + }, + "palette": { + "name": "ecologics/azalea" + } +} diff --git a/content/forgero-compat/src/main/resources/data/forgero/packs/ecologics/material/coconut.json b/content/forgero-compat/src/main/resources/data/forgero/packs/ecologics/material/coconut.json new file mode 100644 index 000000000..fd2207033 --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/packs/ecologics/material/coconut.json @@ -0,0 +1,73 @@ +{ + "type": "WOOD", + "name": "coconut", + "parent": "wood_base", + "container": { + "type": "HOST", + "id": "ecologics:coconut_planks" + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "order": "BASE", + "operation": "ADDITION", + "attributes": [ + { + "id": "wood-durability-composite", + "type": "DURABILITY", + "value": 60 + }, + { + "id": "wood-rarity-composite", + "type": "RARITY", + "value": 15 + }, + { + "id": "wood-weight-composite", + "type": "WEIGHT", + "value": 20 + }, + { + "id": "wood-draw_power-composite", + "type": "forgero:draw_power", + "value": 3.5 + } + ] + }, + { + "context": "UPGRADE", + "attributes": [ + { + "id": "wood-rarity-upgrade", + "type": "RARITY", + "order": "BASE", + "operation": "ADDITION", + "category": "ALL", + "value": 7 + }, + { + "id": "wood-weight-upgrade", + "type": "WEIGHT", + "order": "BASE", + "operation": "ADDITION", + "category": "ALL", + "value": 10 + }, + { + "id": "wood-durability-offensive-upgrade", + "type": "DURABILITY", + "operation": "ADDITION", + "category": "OFFENSIVE", + "value": 30 + } + ] + } + ], + "attributes": [ + ] + }, + "palette": { + "name": "ecologics/coconut" + } +} diff --git a/content/forgero-compat/src/main/resources/data/forgero/packs/ecologics/material/flowering_azalea.json b/content/forgero-compat/src/main/resources/data/forgero/packs/ecologics/material/flowering_azalea.json new file mode 100644 index 000000000..d6a63883a --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/packs/ecologics/material/flowering_azalea.json @@ -0,0 +1,68 @@ +{ + "type": "WOOD", + "name": "flowering_azalea", + "parent": "wood_base", + "container": { + "type": "HOST", + "id": "ecologics:flowering_azalea_planks" + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "order": "BASE", + "operation": "ADDITION", + "attributes": [ + { + "id": "wood-mining-speed-composite", + "type": "MINING_SPEED", + "value": 2.5 + }, + { + "id": "wood-durability-composite", + "type": "DURABILITY", + "value": 44 + }, + { + "id": "wood-rarity-composite", + "type": "RARITY", + "value": 30 + } + ] + }, + { + "context": "UPGRADE", + "attributes": [ + { + "id": "wood-rarity-upgrade", + "type": "RARITY", + "order": "BASE", + "operation": "ADDITION", + "category": "ALL", + "value": 15 + }, + + { + "id": "wood-mining_speed-offensive-upgrade", + "type": "MINING_SPEED", + "operation": "ADDITION", + "category": "OFFENSIVE", + "value": 1.25 + }, + { + "id": "wood-durability-offensive-upgrade", + "type": "DURABILITY", + "operation": "ADDITION", + "category": "OFFENSIVE", + "value": 22 + } + ] + } + ], + "attributes": [ + ] + }, + "palette": { + "name": "ecologics/flowering_azalea" + } +} diff --git a/content/forgero-compat/src/main/resources/data/forgero/packs/ecologics/material/seashell.json b/content/forgero-compat/src/main/resources/data/forgero/packs/ecologics/material/seashell.json new file mode 100644 index 000000000..58d8a2d61 --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/packs/ecologics/material/seashell.json @@ -0,0 +1,54 @@ +{ + "type": "SCALE", + "name": "seashell", + "parent": "scale_base", + "container": { + "type": "HOST", + "id": "ecologics:seashell" + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "order": "BASE", + "operation": "ADDITION", + "attributes": [ + + ] + }, + { + "context": "UPGRADE", + "attributes": [ + { + "id": "scale-rarity-upgrade", + "type": "RARITY", + "order": "BASE", + "operation": "ADDITION", + "category": "ALL", + "value": 30 + }, + { + "id": "scale-weight-upgrade", + "type": "WEIGHT", + "order": "BASE", + "operation": "ADDITION", + "category": "ALL", + "value": 12.5 + }, + { + "id": "scale-durability-offensive-upgrade", + "type": "DURABILITY", + "operation": "ADDITION", + "category": "OFFENSIVE", + "value": 80 + } + ] + } + ], + "attributes": [ + ] + }, + "palette": { + "name": "ecologics/seashell" + } +} diff --git a/content/forgero-compat/src/main/resources/data/forgero/packs/ecologics/material/walnut.json b/content/forgero-compat/src/main/resources/data/forgero/packs/ecologics/material/walnut.json new file mode 100644 index 000000000..c3d919327 --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/packs/ecologics/material/walnut.json @@ -0,0 +1,85 @@ +{ + "type": "WOOD", + "name": "walnut", + "parent": "wood_base", + "container": { + "type": "HOST", + "id": "ecologics:walnut_planks" + }, + "properties": { + "grouped_attributes": [ + { + "context": "COMPOSITE", + "order": "BASE", + "operation": "ADDITION", + "attributes": [ + { + "id": "wood-attack_damage-composite", + "type": "ATTACK_DAMAGE", + "value": 3 + }, + { + "id": "wood-durability-composite", + "type": "DURABILITY", + "value": 65 + }, + { + "id": "wood-rarity-composite", + "type": "RARITY", + "value": 15 + }, + { + "id": "wood-weight-composite", + "type": "WEIGHT", + "value": 40 + }, + { + "id": "wood-draw_power-composite", + "type": "forgero:draw_power", + "value": 3.6 + } + ] + }, + { + "context": "UPGRADE", + "attributes": [ + { + "id": "wood-rarity-upgrade", + "type": "RARITY", + "order": "BASE", + "operation": "ADDITION", + "category": "ALL", + "value": 7 + }, + { + "id": "wood-weight-upgrade", + "type": "WEIGHT", + "order": "BASE", + "operation": "ADDITION", + "category": "ALL", + "value": 20 + }, + { + "id": "wood-durability-offensive-upgrade", + "type": "DURABILITY", + "operation": "ADDITION", + "category": "OFFENSIVE", + "value": 32 + }, + { + "id": "wood-draw_power-offensive-upgrade", + "type": "forgero:draw_power", + "operation": "ADDITION", + "category": "OFFENSIVE", + "value": 0.6 + } + ] + } + ], + "attributes": [ + ] + }, + "palette": { + "name": "ecologics/walnut" + } +} diff --git a/content/forgero-compat/src/main/resources/data/forgero/packs/ecologics/package.json b/content/forgero-compat/src/main/resources/data/forgero/packs/ecologics/package.json new file mode 100644 index 000000000..e528db74c --- /dev/null +++ b/content/forgero-compat/src/main/resources/data/forgero/packs/ecologics/package.json @@ -0,0 +1,12 @@ +{ + "name": "ecologics-materials", + "resource_type": "PACKAGE", + "priority": 4, + "namespace": "ecologics", + "dependencies": [ + "minecraft", + "forgero", + "minecraft-vanilla", + "ecologics" + ] +} diff --git a/fabric/build.gradle b/fabric/build.gradle index 775b0ce44..d52d1ace3 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -119,6 +119,7 @@ curseforge { optionalDependency "betternether" optionalDependency "mystical-crops" optionalDependency "mythicmetals" + optionalDependency "ecologics" optionalDependency "naturalist" optionalDependency "advanced-netherite" incompatible "exordium" @@ -153,6 +154,7 @@ modrinth { optional.project "mystical_crops" optional.project "mythicmetals" optional.project "wiredredstone" + optional.project "ecologics" optional.project "naturalist" optional.project "advanced-netherite" incompatible.project "exordium"