mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-09-11 14:55:59 +00:00
Code Issues Releases Wiki Activity

Merge branch 'mc-1.20.x' into mc-1.21.x

Browse Source
This commit is contained in:
Jonathan Coates
2025-06-28 11:21:17 +01:00
parent 89dd521930 8344c0a5c2
commit fbf994e803
24 changed files with 939 additions and 717 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/common/src/main/resources/assets/computercraft/lang/cs_cz.json
View File

@@ -205,8 +205,10 @@
"item.computercraft.treasure_disk": "Disketa",
"itemGroup.computercraft": "ComputerCraft",
"tag.item.computercraft.computer": "Počítače",
"tag.item.computercraft.disks": "Disky",
"tag.item.computercraft.dyeable": "Obarvitelné předměty",
"tag.item.computercraft.monitor": "Monitory",
"tag.item.computercraft.pocket_computers": "Kapesní počítače",
"tag.item.computercraft.turtle": "Roboti",
"tag.item.computercraft.turtle_can_place": "Roboty-umístitelné předměty",
"tag.item.computercraft.wired_modem": "Drátové modemy",

1
projects/common/src/main/resources/assets/computercraft/lang/de_de.json
View File

@@ -177,6 +177,7 @@
"item.computercraft.treasure_disk": "Diskette",
"itemGroup.computercraft": "ComputerCraft",
"tag.item.computercraft.computer": "Computer",
"tag.item.computercraft.dyeable": "Färbbare Elemente",
"tag.item.computercraft.monitor": "Monitore",
"tag.item.computercraft.turtle": "Turtles",
"tag.item.computercraft.wired_modem": "Verkabelte Modems",

2
projects/common/src/main/resources/assets/computercraft/lang/it_it.json
View File

@@ -205,8 +205,10 @@
"item.computercraft.treasure_disk": "Disco Floppy",
"itemGroup.computercraft": "ComputerCraft",
"tag.item.computercraft.computer": "Computer",
"tag.item.computercraft.dyeable": "Oggetti colorabili",
"tag.item.computercraft.monitor": "Monitor",
"tag.item.computercraft.turtle": "Tartarughe",
"tag.item.computercraft.turtle_can_place": "Oggetti piazzabili da tartarughe",
"tag.item.computercraft.wired_modem": "Modem cablati",
"tracking_field.computercraft.avg": "%s (media)",
"tracking_field.computercraft.computer_tasks.name": "Attività",

2
projects/common/src/main/resources/assets/computercraft/lang/ja_jp.json
View File

@@ -205,8 +205,10 @@
"item.computercraft.treasure_disk": "フロッピーディスク",
"itemGroup.computercraft": "ComputerCraft",
"tag.item.computercraft.computer": "コンピューター",
"tag.item.computercraft.disks": "ディスク",
"tag.item.computercraft.dyeable": "染色可能なアイテム",
"tag.item.computercraft.monitor": "モニター",
"tag.item.computercraft.pocket_computers": "ポケットコンピューター",
"tag.item.computercraft.turtle": "タートル",
"tag.item.computercraft.turtle_can_place": "タートルが設置可能なアイテム",
"tag.item.computercraft.wired_modem": "有線モデム",

1
projects/common/src/main/resources/assets/computercraft/lang/pl_pl.json
View File

@@ -92,6 +92,7 @@
"item.computercraft.printed_pages": "Wydrukowane Strony",
"item.computercraft.treasure_disk": "Dyskietka",
"itemGroup.computercraft": "ComputerCraft",
"tag.item.computercraft.turtle_can_place": "Przedmioty stawialne przez Żółwia",
"upgrade.computercraft.speaker.adjective": "Hałaśliwy",
"upgrade.computercraft.wireless_modem_advanced.adjective": "Enderowy",
"upgrade.computercraft.wireless_modem_normal.adjective": "Bezprzewodowy",

2
projects/common/src/main/resources/assets/computercraft/lang/tr_tr.json
View File

@@ -205,8 +205,10 @@
"item.computercraft.treasure_disk": "Disket",
"itemGroup.computercraft": "ComputerCraft",
"tag.item.computercraft.computer": "Bilgisayarlar",
"tag.item.computercraft.disks": "Diskler",
"tag.item.computercraft.dyeable": "Boyanabilir eşyalar",
"tag.item.computercraft.monitor": "Monitörler",
"tag.item.computercraft.pocket_computers": "Cep Bilgisayarları",
"tag.item.computercraft.turtle": "Turtlelar",
"tag.item.computercraft.turtle_can_place": "Kaplumbağa-yerleştirilebilir eşyalar",
"tag.item.computercraft.wired_modem": "Kablolu modemler",

2
projects/common/src/main/resources/assets/computercraft/lang/zh_cn.json
View File

@@ -205,8 +205,10 @@
"item.computercraft.treasure_disk": "软盘",
"itemGroup.computercraft": "ComputerCraft",
"tag.item.computercraft.computer": "计算机",
"tag.item.computercraft.disks": "磁盘",
"tag.item.computercraft.dyeable": "可染色物品",
"tag.item.computercraft.monitor": "监视器",
"tag.item.computercraft.pocket_computers": "便携式计算机",
"tag.item.computercraft.turtle": "海龟",
"tag.item.computercraft.turtle_can_place": "可放置海龟物品",
"tag.item.computercraft.wired_modem": "有线调制解调器",

51
projects/common/src/testMod/kotlin/dan200/computercraft/gametest/Disk_Test.kt Normal file
View File

@@ -0,0 +1,51 @@
// SPDX-FileCopyrightText: 2025 The CC: Tweaked Developers
//
// SPDX-License-Identifier: MPL-2.0
package dan200.computercraft.gametest
import dan200.computercraft.core.util.Colour
import dan200.computercraft.gametest.api.craftItem
import dan200.computercraft.gametest.api.immediate
import dan200.computercraft.shared.ModRegistry
import dan200.computercraft.shared.util.DataComponentUtil
import dan200.computercraft.test.shared.ItemStackMatcher.isStack
import net.minecraft.core.component.DataComponents
import net.minecraft.gametest.framework.GameTest
import net.minecraft.gametest.framework.GameTestHelper
import net.minecraft.world.item.ItemStack
import net.minecraft.world.item.Items
import net.minecraft.world.item.component.DyedItemColor
import org.hamcrest.MatcherAssert.assertThat
class Disk_Test {
/**
* Ensure disks
*/
@GameTest(template = "default")
fun Can_craft_disk(helper: GameTestHelper) = helper.immediate {
assertThat(
"Disk without dye",
helper.craftItem(ItemStack(Items.REDSTONE), ItemStack(Items.PAPER)),
isStack(
DataComponentUtil.createStack(
ModRegistry.Items.DISK.get(),
DataComponents.DYED_COLOR,
DyedItemColor(Colour.BLUE.hex, false),
),
),
)
assertThat(
"Disk with dye",
helper.craftItem(ItemStack(Items.REDSTONE), ItemStack(Items.PAPER), ItemStack(Items.GREEN_DYE)),
isStack(
DataComponentUtil.createStack(
ModRegistry.Items.DISK.get(),
DataComponents.DYED_COLOR,
DyedItemColor(Colour.GREEN.hex, false),
),
),
)
}
}

1
projects/common/src/testMod/kotlin/dan200/computercraft/gametest/core/TestHooks.kt
View File

@@ -111,6 +111,7 @@ object TestHooks {
Computer_Test::class.java,
CraftOs_Test::class.java,
Details_Test::class.java,
Disk_Test::class.java,
Disk_Drive_Test::class.java,
Inventory_Test::class.java,
Loot_Test::class.java,