Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@nageih
nageih committed Jan 12, 2025
1 parent 424b516 commit 9426995
Show file tree
Hide file tree
Showing 7 changed files with 342 additions and 284 deletions.
502 changes: 251 additions & 251 deletions src/minecraft/config/checklist/tasks.txt
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion src/minecraft/config/mysticalcustomization/crops/rgb_crop.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"name": "RGB",
"type": "mysticalagriculture:resource",
"tier": "mysticalagriculture:5",
"ingredient": {
Expand Down
35 changes: 35 additions & 0 deletions ...necraft/global_packs/required_resources/sf5_resources/assets/skyfactory_5/lang/en_us.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1029,6 +1029,7 @@
"crop.mysticalcustomization.pink_crop": "Pink",
"crop.mysticalcustomization.purple_crop": "Purple",
"crop.mysticalcustomization.red_crop": "Red",
"crop.mysticalcustomization.rgb_crop": "RGB",
"crop.mysticalcustomization.white_crop": "White",
"crop.mysticalcustomization.yellow_crop": "Yellow",
"entity.minecraft.villager.spacecatcustomprofessions.villager_black": "Black Pearl Trader",
Expand Down Expand Up @@ -1686,6 +1687,22 @@
"skyfactory_5.chicken.entity.loot": "Chicken Loot",
"skyfactory_5.cluckshroom.entity.loot": "Cluckshroom Loot",
"skyfactory_5.cod.entity.loot": "Cod Loot",
"skyfactory_5.color_discover.black": "Black has been added to your pallette",
"skyfactory_5.color_discover.blue": "Blue has been added to your pallette",
"skyfactory_5.color_discover.brown": "Brown has been added to your pallette",
"skyfactory_5.color_discover.cyan": "Cyan has been added to your pallette",
"skyfactory_5.color_discover.gray": "Gray has been added to your pallette",
"skyfactory_5.color_discover.green": "Green has been added to your pallette",
"skyfactory_5.color_discover.light_blue": "Light Blue has been added to your pallette",
"skyfactory_5.color_discover.light_gray": "Light Gray has been added to your pallette",
"skyfactory_5.color_discover.lime": "Lime has been added to your pallette",
"skyfactory_5.color_discover.magenta": "Magenta has been added to your pallette",
"skyfactory_5.color_discover.orange": "Orange has been added to your pallette",
"skyfactory_5.color_discover.pink": "Pink has been added to your pallette",
"skyfactory_5.color_discover.purple": "Purple has been added to your pallette",
"skyfactory_5.color_discover.red": "Red has been added to your pallette",
"skyfactory_5.color_discover.white": "White has been added to your pallette",
"skyfactory_5.color_discover.yellow": "Yellow has been added to your pallette",
"skyfactory_5.cow.entity.loot": "Cow Loot",
"skyfactory_5.cream_cow.entity.loot": "Cream Cow Loot",
"skyfactory_5.creeper.entity.loot": "Creeper Loot",
Expand Down Expand Up @@ -1759,11 +1776,29 @@
"skyfactory_5.llama.entity.loot": "Llama Loot",
"skyfactory_5.lobber_drowned.entity.loot": "Lobber Drowned Loot",
"skyfactory_5.lobber_zombie.entity.loot": "Lobber Zombie Loot",
"skyfactory_5.loot_bag.black": "Black Loot Bag",
"skyfactory_5.loot_bag.blue": "Blue Loot Bag",
"skyfactory_5.loot_bag.brown": "Brown Loot Bag",
"skyfactory_5.loot_bag.cyan": "Cyan Loot Bag",
"skyfactory_5.loot_bag.gray": "Gray Loot Bag",
"skyfactory_5.loot_bag.green": "Green Loot Bag",
"skyfactory_5.loot_bag.light_blue": "Light Blue Loot Bag",
"skyfactory_5.loot_bag.light_gray": "Light Gray Loot Bag",
"skyfactory_5.loot_bag.lime": "Lime Loot Bag",
"skyfactory_5.loot_bag.magenta": "Magenta Loot Bag",
"skyfactory_5.loot_bag.orange": "Orange Loot Bag",
"skyfactory_5.loot_bag.pink": "Pink Loot Bag",
"skyfactory_5.loot_bag.purple": "Purple Loot Bag",
"skyfactory_5.loot_bag.red": "Red Loot Bag",
"skyfactory_5.loot_bag.white": "White Loot Bag",
"skyfactory_5.loot_bag.yellow": "Yellow Loot Bag",
"skyfactory_5.magenta_challenge_gateway_loot": "Magenta Challenge Gateway Loot",
"skyfactory_5.magenta_vein_creeper.entity.loot": "Magenta Vein Creeper Loot",
"skyfactory_5.magma_cow.entity.loot": "Magma Cow Loot",
"skyfactory_5.magma_cube.entity.loot": "Magma Cube Loot",
"skyfactory_5.melon_golem.entity.loot": "Melon Golem Loot",
"skyfactory_5.mob_spawn.disable": " will no longer spawn!",
"skyfactory_5.mob_spawn.enable": " will now spawn!",
"skyfactory_5.moobloom.entity.loot": "Moobloom Loot",
"skyfactory_5.moolip.entity.loot": "Moolip Loot",
"skyfactory_5.mooshroom.entity.loot": "Mooshroom Loot",
Expand Down
35 changes: 35 additions & 0 deletions ...necraft/global_packs/required_resources/sf5_resources/assets/skyfactory_5/lang/zh_cn.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1029,6 +1029,7 @@
"crop.mysticalcustomization.pink_crop": "Pink",
"crop.mysticalcustomization.purple_crop": "Purple",
"crop.mysticalcustomization.red_crop": "Red",
"crop.mysticalcustomization.rgb_crop": "RGB",
"crop.mysticalcustomization.white_crop": "White",
"crop.mysticalcustomization.yellow_crop": "Yellow",
"entity.minecraft.villager.spacecatcustomprofessions.villager_black": "黑色珍珠交易员",
Expand Down Expand Up @@ -1686,6 +1687,22 @@
"skyfactory_5.chicken.entity.loot": "鸡战利品",
"skyfactory_5.cluckshroom.entity.loot": "咯菇战利品",
"skyfactory_5.cod.entity.loot": "鳕鱼战利品",
"skyfactory_5.color_discover.black": "Black has been added to your pallette",
"skyfactory_5.color_discover.blue": "Blue has been added to your pallette",
"skyfactory_5.color_discover.brown": "Brown has been added to your pallette",
"skyfactory_5.color_discover.cyan": "Cyan has been added to your pallette",
"skyfactory_5.color_discover.gray": "Gray has been added to your pallette",
"skyfactory_5.color_discover.green": "Green has been added to your pallette",
"skyfactory_5.color_discover.light_blue": "Light Blue has been added to your pallette",
"skyfactory_5.color_discover.light_gray": "Light Gray has been added to your pallette",
"skyfactory_5.color_discover.lime": "Lime has been added to your pallette",
"skyfactory_5.color_discover.magenta": "Magenta has been added to your pallette",
"skyfactory_5.color_discover.orange": "Orange has been added to your pallette",
"skyfactory_5.color_discover.pink": "Pink has been added to your pallette",
"skyfactory_5.color_discover.purple": "Purple has been added to your pallette",
"skyfactory_5.color_discover.red": "Red has been added to your pallette",
"skyfactory_5.color_discover.white": "White has been added to your pallette",
"skyfactory_5.color_discover.yellow": "Yellow has been added to your pallette",
"skyfactory_5.cow.entity.loot": "牛战利品",
"skyfactory_5.cream_cow.entity.loot": "奶油牛战利品",
"skyfactory_5.creeper.entity.loot": "苦力怕战利品",
Expand Down Expand Up @@ -1759,11 +1776,29 @@
"skyfactory_5.llama.entity.loot": "羊驼战利品",
"skyfactory_5.lobber_drowned.entity.loot": "投手溺尸战利品",
"skyfactory_5.lobber_zombie.entity.loot": "投手僵尸战利品",
"skyfactory_5.loot_bag.black": "Black Loot Bag",
"skyfactory_5.loot_bag.blue": "Blue Loot Bag",
"skyfactory_5.loot_bag.brown": "Brown Loot Bag",
"skyfactory_5.loot_bag.cyan": "Cyan Loot Bag",
"skyfactory_5.loot_bag.gray": "Gray Loot Bag",
"skyfactory_5.loot_bag.green": "Green Loot Bag",
"skyfactory_5.loot_bag.light_blue": "Light Blue Loot Bag",
"skyfactory_5.loot_bag.light_gray": "Light Gray Loot Bag",
"skyfactory_5.loot_bag.lime": "Lime Loot Bag",
"skyfactory_5.loot_bag.magenta": "Magenta Loot Bag",
"skyfactory_5.loot_bag.orange": "Orange Loot Bag",
"skyfactory_5.loot_bag.pink": "Pink Loot Bag",
"skyfactory_5.loot_bag.purple": "Purple Loot Bag",
"skyfactory_5.loot_bag.red": "Red Loot Bag",
"skyfactory_5.loot_bag.white": "White Loot Bag",
"skyfactory_5.loot_bag.yellow": "Yellow Loot Bag",
"skyfactory_5.magenta_challenge_gateway_loot": "品红色挑战传送门战利品",
"skyfactory_5.magenta_vein_creeper.entity.loot": "品红色矿脉苦力怕战利品",
"skyfactory_5.magma_cow.entity.loot": "岩浆牛战利品",
"skyfactory_5.magma_cube.entity.loot": "岩浆怪战利品",
"skyfactory_5.melon_golem.entity.loot": "西瓜傀儡战利品",
"skyfactory_5.mob_spawn.disable": " will no longer spawn!",
"skyfactory_5.mob_spawn.enable": " will now spawn!",
"skyfactory_5.moobloom.entity.loot": "哞花战利品",
"skyfactory_5.moolip.entity.loot": "哞金香战利品",
"skyfactory_5.mooshroom.entity.loot": "哞菇战利品",
Expand Down
17 changes: 3 additions & 14 deletions src/minecraft/scripts/stages/chat_message.zs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,7 @@ import mods.gamestages.events.GameStageAdded;
// TODO: Messages should use lang keys
// Send a message when the player recieves certain stages
events.register<GameStageAdded>((event) => {
var message: string = "";

switch event.stage {
case "brown":
message = "你的调色板中恢复了棕色";
break;
case "black":
message = "你的调色板中恢复了黑色";
break;
}

if !message.empty {
event.entity.sendMessage(message);
}
if !event.stage.empty {
event.entity.sendMessage(Component.translatable("skyfactory5.color_discover." + event.stage));
}
});
4 changes: 2 additions & 2 deletions src/minecraft/scripts/staging/mobs.zs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ public class StagedMob {
player.sendMessage(
Component.empty()
.append(this.entityType.getDescription())
.append(Component.literal(" will now spawn!"))
.append(Component.translatable("skyfactory_5.mob_spawn.enable"))
.withStyle(style => style.withColor(<constant:minecraft:formatting:green>))
);
} else {
player.removeGameStage(this.stageName);
player.sendMessage(
Component.empty()
.append(this.entityType.getDescription())
.append(Component.literal(" will no longer spawn!"))
.append(Component.translatable("skyfactory_5.mob_spawn.disable"))
.withStyle(style => style.withColor(<constant:minecraft:formatting:red>))
);
}
Expand Down
32 changes: 16 additions & 16 deletions src/minecraft/scripts/villager_trades.zs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,22 +84,22 @@ villagerTrades.addWanderingTrade(1, 4, <item:pizzacraft:olive_sapling>, 4, 8);
villagerTrades.addWanderingTrade(1, 4, <item:thermal:corn_seeds>, 4, 8);
villagerTrades.addWanderingTrade(1, 4, <item:thermal:onion_seeds>, 4, 8);
// Level 2
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/pink_loot_bag", Color: 15961002, Name: "粉红色战利品袋"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/yellow_loot_bag", Color: 16701501, Name: "黄色战利品袋"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/white_loot_bag", Color: 16383998, Name: "白色战利品袋"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/light_blue_loot_bag", Color: 3847130, Name: "淡蓝色战利品袋"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/orange_loot_bag", Color: 16351261, Name: "橙色战利品袋"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/black_loot_bag", Color: 1908001, Name: "黑色战利品袋"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/gray_loot_bag", Color: 4673362, Name: "灰色战利品袋"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/lime_loot_bag", Color: 8439583, Name: "黄绿色战利品袋"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/blue_loot_bag", Color: 3949738, Name: "蓝色战利品袋"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/purple_loot_bag", Color: 8991416, Name: "紫色战利品袋"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/cyan_loot_bag", Color: 1481884, Name: "青色战利品袋"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/light_gray_loot_bag", Color: 10329495, Name: "淡灰色战利品袋"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/red_loot_bag", Color: 11546150, Name: "红色战利品袋"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/green_loot_bag", Color: 6192150, Name: "绿色战利品袋"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/brown_loot_bag", Color: 8606770, Name: "棕色战利品袋"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/magenta_loot_bag", Color: 13061821, Name: "品红色战利品袋"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/pink_loot_bag", Color: 15961002, Name: "skyfactory_5.loot_bag.pink"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/yellow_loot_bag", Color: 16701501, Name: "skyfactory_5.loot_bag.yellow"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/white_loot_bag", Color: 16383998, Name: "skyfactory_5.loot_bag.white"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/light_blue_loot_bag", Color: 3847130, Name: "skyfactory_5.loot_bag.light_blue"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/orange_loot_bag", Color: 16351261, Name: "skyfactory_5.loot_bag.orange"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/black_loot_bag", Color: 1908001, Name: "skyfactory_5.loot_bag.black"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/gray_loot_bag", Color: 4673362, Name: "skyfactory_5.loot_bag.grey"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/lime_loot_bag", Color: 8439583, Name: "skyfactory_5.loot_bag.lime"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/blue_loot_bag", Color: 3949738, Name: "skyfactory_5.loot_bag.blue"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/purple_loot_bag", Color: 8991416, Name: "skyfactory_5.loot_bag.purple"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/cyan_loot_bag", Color: 1481884, Name: "skyfactory_5.loot_bag.cyan"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/light_gray_loot_bag", Color: 10329495, Name: "skyfactory_5.loot_bag.light_grey"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/red_loot_bag", Color: 11546150, Name: "skyfactory_5.loot_bag.red"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/green_loot_bag", Color: 6192150, Name: "skyfactory_5.loot_bag.green"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/brown_loot_bag", Color: 8606770, Name: "skyfactory_5.loot_bag.brown"}), 4, 9);
villagerTrades.addWanderingTrade(2, 8, <item:lootbags:loot_bag>.withTag({Type: "COMMON", Loot: "skyfactory_5:loot_bags/magenta_loot_bag", Color: 13061821, Name: "skyfactory_5.loot_bag.magenta"}), 4, 9);


// // Armorer
Expand Down

0 comments on commit 9426995

Please sign in to comment.