Skip to content

Commit

Permalink
改一堆
Browse files Browse the repository at this point in the history
  • Loading branch information
MagicHarp committed Oct 3, 2024
1 parent ae4ae09 commit 1c4ddd4
Show file tree
Hide file tree
Showing 17 changed files with 180 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,8 @@ protected void addTranslations() {
add("fluid_type.confluence.honey", "蜂蜜");

add("title.confluence.shimmer_transmutation", "微光嬗变");
add("title.confluence.altar", "献祭");
add("title.confluence.sky_mill", "天域工艺");
add("condition.confluence.shimmer_transmutation", "需要的游戏阶段: %s");

add("item.confluence.aglet.info", "它可以在地表宝箱、木匣和珍珠木匣中找到。");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public static void villagerTrades(VillagerTradesEvent event) {
trades.get(2).add(new BasicItemListing(new ItemStack(Items.DIRT, getRandomQuantity(61, 64)),new ItemStack(Items.EMERALD, 1), 2, 10, 0.05f));
trades.get(3).add(new BasicItemListing(new ItemStack(Materials.EMERALD_COIN.get(), 1), new ItemStack(ModItems.CLOUDWEAVER_SEED.get(), 3), 25, 10, 0.05f));
trades.get(3).add(new BasicItemListing(new ItemStack(Items.WATER_BUCKET, 1), new ItemStack(ModBlocks.RAIN_CLOUD_BLOCK.get(), 1), 12, 20, 0.05f));
trades.get(3).add(new BasicItemListing(new ItemStack(Materials.FALLING_STAR.get(), getRandomQuantity(20, 22)), new ItemStack(DecorativeBlocks.SUN_PLATE.get(), 10), 12, 20, 0.05f));
trades.get(3).add(new BasicItemListing(new ItemStack(Materials.FALLING_STAR.get(), getRandomQuantity(2, 3)), new ItemStack(DecorativeBlocks.SUN_PLATE.get(), 10), 12, 20, 0.05f));
trades.get(4).add(new BasicItemListing(new ItemStack(Items.POWDER_SNOW_BUCKET, 1), new ItemStack(Items.EMERALD, 1), 12, 30, 0.05f));
trades.get(5).add(new BasicItemListing(new ItemStack(Materials.EMERALD_COIN.get(), 2), new ItemStack(ModBlocks.SKY_MILL.get(), 1), 12, 30, 0.05f));
} else if (type == VillagerProfession.FARMER) {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"type": "confluence:altar",
"result": {
"item": "confluence:flaming_arrow",
"count": 25
},
"ingredients": [
{
"item": "minecraft:torch",
"count": 1
},
{
"item": "minecraft:arrow",
"count": 25
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"type": "confluence:altar",
"result": {
"item": "confluence:jesters_arrow",
"count": 25
},
"ingredients": [
{
"item": "confluence:falling_star",
"count": 1
},
{
"item": "minecraft:arrow",
"count": 25
}
]
}
2 changes: 1 addition & 1 deletion src/main/resources/data/confluence/recipes/arrows.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"result": {
"item": "minecraft:arrow",
"count": 9
"count": 25
},
"group": "misc"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "minecraft:smelting",
"ingredient": {
"item": "confluence:fluttering_lamb_chops"
},
"result": "confluence:cooked_fluttering_lamb_chops",
"experience": 0.1,
"cookingtime": 200
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "minecraft:smoking",
"ingredient": {
"item": "confluence:fluttering_lamb_chops"
},
"result": "confluence:cooked_fluttering_lamb_chops",
"experience": 0.1,
"cookingtime": 100
}
20 changes: 20 additions & 0 deletions src/main/resources/data/confluence/recipes/ebony_axe.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"##",
"#/",
" /"
],
"key": {
"#": {
"item": "confluence:ebony_ingot"
},
"/": {
"item": "minecraft:stick"
}
},
"result": {
"item": "confluence:ebony_axe",
"count": 1
}
}
20 changes: 20 additions & 0 deletions src/main/resources/data/confluence/recipes/ebony_hammer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"###",
"#/#",
" / "
],
"key": {
"#": {
"item": "confluence:ebony_ingot"
},
"/": {
"item": "minecraft:stick"
}
},
"result": {
"item": "confluence:ebony_hammer",
"count": 1
}
}
29 changes: 29 additions & 0 deletions src/main/resources/data/confluence/recipes/longevity_noodles.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"#B",
"WW",
"P/"
],
"key": {
"#": {
"item": "minecraft:egg"
},
"B": {
"item": "minecraft:beetroot"
},
"W": {
"item": "minecraft:wheat"
},
"P": {
"item": "minecraft:bowl"
},
"/": {
"item": "minecraft:stick"
}
},
"result": {
"item": "confluence:longevity_noodles",
"count": 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"type": "confluence:sky_mill",
"result": {
"item": "confluence:cloud_block",
"count": 1
},
"ingredients": [
{
"item": "confluence:weaving_cloud_cotton",
"count": 1
}

]
}
20 changes: 20 additions & 0 deletions src/main/resources/data/confluence/recipes/tr_crimson_axe.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"##",
"#/",
" /"
],
"key": {
"#": {
"item": "confluence:tr_crimson_ingot"
},
"/": {
"item": "minecraft:stick"
}
},
"result": {
"item": "confluence:tr_crimson_axe",
"count": 1
}
}
20 changes: 20 additions & 0 deletions src/main/resources/data/confluence/recipes/tr_crimson_hammer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"###",
"#/#",
" / "
],
"key": {
"#": {
"item": "confluence:tr_crimson_ingot"
},
"/": {
"item": "minecraft:stick"
}
},
"result": {
"item": "confluence:tr_crimson_hammer",
"count": 1
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"placement": [
{
"type": "minecraft:count",
"count": 13
"count": 11
},
{
"type": "minecraft:in_square"
Expand Down

0 comments on commit 1c4ddd4

Please sign in to comment.