mirrors/cobblemon
1
0
Fork 1
mirror of https://gitlab.com/cable-mc/cobblemon.git synced 2026-10-20 14:16:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'testing-fixes' into 'main'

Browse Source 
Small Fixes

See merge request cable-mc/cobblemon!2448
This commit is contained in:
Polymeta
2026-10-05 07:02:45 +00:00
parent 3013302f35 0807d73646
commit 20fac724f6
4 changed files with 60 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItems.kt
+1 -1
View File
@@ -1103,7 +1103,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
@JvmField
val SMOOTH_ROCK = itemNameBlockItem("smooth_rock", CobblemonBlocks.SMOOTH_ROCK)
@JvmField
val ICY_ROCK = heldItem("icy_rock")
val ICY_ROCK = itemNameBlockItem("icy_rock", CobblemonBlocks.ICY_ROCK)
// Mulch
@JvmField
common/src/main/resources/data/cobblemon/advancement/recipes/evolution/fire_stone_from_smelting_nether_fire_stone_ore.json
+1 -1
View File
@@ -6,7 +6,7 @@
]
},
"criteria": {
"has_netherrack_fire_stone_ore": {
"has_nether_fire_stone_ore": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
common/src/main/resources/data/cobblemon/loot_table/blocks/wistensu.json
+3 -3
View File
@@ -2,7 +2,7 @@
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"bonus_rolls": 0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
@@ -11,10 +11,10 @@
"entries": [
{
"type": "minecraft:item",
"name": "cobbleon:wistensu"
"name": "cobblemon:wistensu"
}
],
"rolls": 1.0
"rolls": 1
}
]
}
common/src/main/resources/data/cobblemon/loot_table/blocks/wistensu_vine.json
+55 -10
View File
@@ -2,19 +2,64 @@
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"bonus_rolls": 0,
"entries": [
{
"type": "minecraft:item",
"name": "cobbleon:wistensu"
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:any_of",
"terms": [
{
"condition": "minecraft:match_tool",
"predicate": {
"items": "minecraft:shears"
}
},
{
"condition": "minecraft:match_tool",
"predicate": {
"predicates": {
"minecraft:enchantments": [
{
"enchantments": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
}
]
}
],
"name": "cobblemon:wistensu"
},
{
"type": "minecraft:item",
"conditions": [
{
"chances": [
0.33,
0.55,
0.77,
1
],
"condition": "minecraft:table_bonus",
"enchantment": "minecraft:fortune"
}
],
"name": "cobblemon:wistensu"
}
]
}
],
"rolls": 1.0
"rolls": 1
}
]
],
"random_sequence": "cobblemon:blocks/wistensu_vine"
}