Skip to content

Commit

Permalink
Partial backport from 1.20.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Mechalopa committed Apr 6, 2024
1 parent 03566aa commit c38d3e7
Show file tree
Hide file tree
Showing 13 changed files with 162 additions and 26 deletions.
4 changes: 2 additions & 2 deletions src/main/resources/assets/hmag/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"entity.hmag.harpy": "Harpy",
"entity.hmag.savagefang": "Savagefang",
"entity.hmag.fortress_keeper": "Fortress Keeper",
"entity.hmag.necrotic_reaper": "Necrotic Reaper",
"entity.hmag.necrotic_reaper": "Necrostalker",
"entity.hmag.dodomeki": "Dodomeki",
"entity.hmag.imp": "Imp",
"entity.hmag.glaryad": "Glaryad",
Expand Down Expand Up @@ -155,7 +155,7 @@
"item.hmag.harpy_spawn_egg": "Harpy Spawn Egg",
"item.hmag.savagefang_spawn_egg": "Savagefang Spawn Egg",
"item.hmag.fortress_keeper_spawn_egg": "Fortress Keeper Spawn Egg",
"item.hmag.necrotic_reaper_spawn_egg": "Necrotic Reaper Spawn Egg",
"item.hmag.necrotic_reaper_spawn_egg": "Necrostalker Spawn Egg",
"item.hmag.dodomeki_spawn_egg": "Dodomeki Spawn Egg",
"item.hmag.imp_spawn_egg": "Imp Spawn Egg",
"item.hmag.glaryad_spawn_egg": "Glaryad Spawn Egg",
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/assets/hmag/lang/ja_jp.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"entity.hmag.harpy": "ハーピー",
"entity.hmag.savagefang": "サベージファング",
"entity.hmag.fortress_keeper": "フォートレスキーパー",
"entity.hmag.necrotic_reaper": "ネクロティックリーパー",
"entity.hmag.necrotic_reaper": "ネクロストーカー",
"entity.hmag.dodomeki": "百々目鬼",
"entity.hmag.imp": "インプ",
"entity.hmag.glaryad": "グレアード",
Expand Down Expand Up @@ -155,7 +155,7 @@
"item.hmag.harpy_spawn_egg": "ハーピーのスポーンエッグ",
"item.hmag.savagefang_spawn_egg": "サベージファングのスポーンエッグ",
"item.hmag.fortress_keeper_spawn_egg": "フォートレスキーパーのスポーンエッグ",
"item.hmag.necrotic_reaper_spawn_egg": "ネクロティックリーパーのスポーンエッグ",
"item.hmag.necrotic_reaper_spawn_egg": "ネクロストーカーのスポーンエッグ",
"item.hmag.dodomeki_spawn_egg": "百々目鬼のスポーンエッグ",
"item.hmag.imp_spawn_egg": "インプのスポーンエッグ",
"item.hmag.glaryad_spawn_egg": "グレアードのスポーンエッグ",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"type": "minecraft:crafting_shapeless",
"conditions": [
{
"type": "forge:item_exists",
"item": "botania:ender_air_bottle"
}
],
"ingredients": [
{
"item": "botania:ender_air_bottle"
},
{
"item": "hmag:ender_plasm"
},
{
"tag": "forge:dusts/blaze"
},
{
"tag": "forge:gunpowder"
}
],
"result": {
"item": "minecraft:dragon_breath"
}
}
Original file line number Diff line number Diff line change
@@ -1,20 +1,29 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "minecraft:glass_bottle"
},
{
"item": "hmag:ender_plasm"
},
{
"tag": "forge:dusts/blaze"
},
{
"tag": "forge:gunpowder"
}
],
"result": {
"item": "minecraft:dragon_breath"
}
{
"type": "minecraft:crafting_shapeless",
"conditions": [
{
"type": "forge:not",
"value": {
"type": "forge:item_exists",
"item": "botania:ender_air_bottle"
}
}
],
"ingredients": [
{
"item": "minecraft:glass_bottle"
},
{
"item": "hmag:ender_plasm"
},
{
"tag": "forge:dusts/blaze"
},
{
"tag": "forge:gunpowder"
}
],
"result": {
"item": "minecraft:dragon_breath"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "immersiveengineering"
}
],
"type": "immersiveengineering:fermenter",
"energy": 6400,
"fluid": {
"amount": 250,
"fluid": "immersiveengineering:ethanol"
},
"input": {
"item": "hmag:cubic_nucleus"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "immersiveengineering"
}
],
"type": "immersiveengineering:fermenter",
"energy": 6400,
"fluid": {
"amount": 50,
"fluid": "immersiveengineering:ethanol"
},
"input": {
"item": "hmag:cureberry"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "immersiveengineering"
}
],
"type": "immersiveengineering:fermenter",
"energy": 6400,
"fluid": {
"amount": 100,
"fluid": "immersiveengineering:ethanol"
},
"input": {
"item": "hmag:exp_berry"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "immersiveengineering"
}
],
"type": "immersiveengineering:fermenter",
"energy": 6400,
"fluid": {
"amount": 50,
"fluid": "immersiveengineering:ethanol"
},
"input": {
"item": "hmag:lemon"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "immersiveengineering"
}
],
"type": "immersiveengineering:fermenter",
"energy": 6400,
"fluid": {
"amount": 80,
"fluid": "immersiveengineering:ethanol"
},
"input": {
"item": "hmag:randomberry"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
"fluid": "tconstruct:molten_glass",
"amount": 50
},
"damage": 2
"damage": 4
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
],
"type": "tconstruct:entity_melting",
"entity": {
"type": "hmag:lich"
"types": [
"hmag:lich",
"hmag:necrotic_reaper"
]
},
"result": {
"fluid": "minecraft:milk",
Expand Down
11 changes: 10 additions & 1 deletion src/main/resources/data/hmag/tags/blocks/ogre_immune.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
{
"replace": false,
"values": [
"#minecraft:wither_immune"
"#minecraft:wither_immune",
"minecraft:spawner",
{
"id": "quark:monster_box",
"required": false
},
{
"id": "#lootr:containers",
"required": false
}
]
}
4 changes: 4 additions & 0 deletions src/main/resources/data/hmag/tags/entity_types/bats.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
"replace": false,
"values": [
"minecraft:bat",
{
"id": "vampirism:blinding_bat",
"required": false
},
{
"id": "spookybats:pumpkin_bat",
"required": false
Expand Down

0 comments on commit c38d3e7

Please sign in to comment.