mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2025-10-25 02:47:39 +00:00
Update to 1.20
- Use GuiGraphics for rendering UI elements. Almost definitely some z-fighting issues slipped in here. - Use Forge's loot modifier system for handling treasure disks. I have mixed feelings about this - it's a nice system, but also is far less efficient than the previous approach. - Regenerate data. This is the brunt of the commit, but nothing especially interesting here.
This commit is contained in:
Jonathan Coates
@@ -11,5 +11,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_monitor", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:skull_cloudy"]}
|
||||
"rewards": {"recipes": ["computercraft:skull_cloudy"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -11,5 +11,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_computer", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:skull_dan200"]}
|
||||
"rewards": {"recipes": ["computercraft:skull_dan200"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -12,5 +12,6 @@
|
||||
"has_the_recipe": {"conditions": {"recipe": "computercraft:cable"}, "trigger": "minecraft:recipe_unlocked"}
|
||||
},
|
||||
"requirements": [["has_computer", "has_modem", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:cable"]}
|
||||
"rewards": {"recipes": ["computercraft:cable"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -11,5 +11,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_components", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:computer_advanced"]}
|
||||
"rewards": {"recipes": ["computercraft:computer_advanced"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -11,5 +11,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_components", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:computer_advanced_upgrade"]}
|
||||
"rewards": {"recipes": ["computercraft:computer_advanced_upgrade"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -11,5 +11,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_components", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:computer_command"]}
|
||||
"rewards": {"recipes": ["computercraft:computer_command"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -11,5 +11,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_redstone", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:computer_normal"]}
|
||||
"rewards": {"recipes": ["computercraft:computer_normal"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -8,5 +8,6 @@
|
||||
"has_the_recipe": {"conditions": {"recipe": "computercraft:disk_1"}, "trigger": "minecraft:recipe_unlocked"}
|
||||
},
|
||||
"requirements": [["has_drive", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:disk_1"]}
|
||||
"rewards": {"recipes": ["computercraft:disk_1"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -8,5 +8,6 @@
|
||||
"has_the_recipe": {"conditions": {"recipe": "computercraft:disk_10"}, "trigger": "minecraft:recipe_unlocked"}
|
||||
},
|
||||
"requirements": [["has_drive", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:disk_10"]}
|
||||
"rewards": {"recipes": ["computercraft:disk_10"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -8,5 +8,6 @@
|
||||
"has_the_recipe": {"conditions": {"recipe": "computercraft:disk_11"}, "trigger": "minecraft:recipe_unlocked"}
|
||||
},
|
||||
"requirements": [["has_drive", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:disk_11"]}
|
||||
"rewards": {"recipes": ["computercraft:disk_11"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -8,5 +8,6 @@
|
||||
"has_the_recipe": {"conditions": {"recipe": "computercraft:disk_12"}, "trigger": "minecraft:recipe_unlocked"}
|
||||
},
|
||||
"requirements": [["has_drive", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:disk_12"]}
|
||||
"rewards": {"recipes": ["computercraft:disk_12"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -8,5 +8,6 @@
|
||||
"has_the_recipe": {"conditions": {"recipe": "computercraft:disk_13"}, "trigger": "minecraft:recipe_unlocked"}
|
||||
},
|
||||
"requirements": [["has_drive", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:disk_13"]}
|
||||
"rewards": {"recipes": ["computercraft:disk_13"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -8,5 +8,6 @@
|
||||
"has_the_recipe": {"conditions": {"recipe": "computercraft:disk_14"}, "trigger": "minecraft:recipe_unlocked"}
|
||||
},
|
||||
"requirements": [["has_drive", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:disk_14"]}
|
||||
"rewards": {"recipes": ["computercraft:disk_14"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -8,5 +8,6 @@
|
||||
"has_the_recipe": {"conditions": {"recipe": "computercraft:disk_15"}, "trigger": "minecraft:recipe_unlocked"}
|
||||
},
|
||||
"requirements": [["has_drive", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:disk_15"]}
|
||||
"rewards": {"recipes": ["computercraft:disk_15"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -8,5 +8,6 @@
|
||||
"has_the_recipe": {"conditions": {"recipe": "computercraft:disk_16"}, "trigger": "minecraft:recipe_unlocked"}
|
||||
},
|
||||
"requirements": [["has_drive", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:disk_16"]}
|
||||
"rewards": {"recipes": ["computercraft:disk_16"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -8,5 +8,6 @@
|
||||
"has_the_recipe": {"conditions": {"recipe": "computercraft:disk_2"}, "trigger": "minecraft:recipe_unlocked"}
|
||||
},
|
||||
"requirements": [["has_drive", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:disk_2"]}
|
||||
"rewards": {"recipes": ["computercraft:disk_2"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -8,5 +8,6 @@
|
||||
"has_the_recipe": {"conditions": {"recipe": "computercraft:disk_3"}, "trigger": "minecraft:recipe_unlocked"}
|
||||
},
|
||||
"requirements": [["has_drive", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:disk_3"]}
|
||||
"rewards": {"recipes": ["computercraft:disk_3"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -8,5 +8,6 @@
|
||||
"has_the_recipe": {"conditions": {"recipe": "computercraft:disk_4"}, "trigger": "minecraft:recipe_unlocked"}
|
||||
},
|
||||
"requirements": [["has_drive", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:disk_4"]}
|
||||
"rewards": {"recipes": ["computercraft:disk_4"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -8,5 +8,6 @@
|
||||
"has_the_recipe": {"conditions": {"recipe": "computercraft:disk_5"}, "trigger": "minecraft:recipe_unlocked"}
|
||||
},
|
||||
"requirements": [["has_drive", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:disk_5"]}
|
||||
"rewards": {"recipes": ["computercraft:disk_5"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -8,5 +8,6 @@
|
||||
"has_the_recipe": {"conditions": {"recipe": "computercraft:disk_6"}, "trigger": "minecraft:recipe_unlocked"}
|
||||
},
|
||||
"requirements": [["has_drive", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:disk_6"]}
|
||||
"rewards": {"recipes": ["computercraft:disk_6"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -8,5 +8,6 @@
|
||||
"has_the_recipe": {"conditions": {"recipe": "computercraft:disk_7"}, "trigger": "minecraft:recipe_unlocked"}
|
||||
},
|
||||
"requirements": [["has_drive", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:disk_7"]}
|
||||
"rewards": {"recipes": ["computercraft:disk_7"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -8,5 +8,6 @@
|
||||
"has_the_recipe": {"conditions": {"recipe": "computercraft:disk_8"}, "trigger": "minecraft:recipe_unlocked"}
|
||||
},
|
||||
"requirements": [["has_drive", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:disk_8"]}
|
||||
"rewards": {"recipes": ["computercraft:disk_8"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -8,5 +8,6 @@
|
||||
"has_the_recipe": {"conditions": {"recipe": "computercraft:disk_9"}, "trigger": "minecraft:recipe_unlocked"}
|
||||
},
|
||||
"requirements": [["has_drive", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:disk_9"]}
|
||||
"rewards": {"recipes": ["computercraft:disk_9"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -8,5 +8,6 @@
|
||||
"has_the_recipe": {"conditions": {"recipe": "computercraft:disk_drive"}, "trigger": "minecraft:recipe_unlocked"}
|
||||
},
|
||||
"requirements": [["has_computer", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:disk_drive"]}
|
||||
"rewards": {"recipes": ["computercraft:disk_drive"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -11,5 +11,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_computer", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:monitor_advanced"]}
|
||||
"rewards": {"recipes": ["computercraft:monitor_advanced"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -11,5 +11,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_computer", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:monitor_normal"]}
|
||||
"rewards": {"recipes": ["computercraft:monitor_normal"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -13,5 +13,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_items", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:pocket_advanced/computercraft/speaker"]}
|
||||
"rewards": {"recipes": ["computercraft:pocket_advanced/computercraft/speaker"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -16,5 +16,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_items", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:pocket_advanced/computercraft/wireless_modem_advanced"]}
|
||||
"rewards": {"recipes": ["computercraft:pocket_advanced/computercraft/wireless_modem_advanced"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -16,5 +16,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_items", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:pocket_advanced/computercraft/wireless_modem_normal"]}
|
||||
"rewards": {"recipes": ["computercraft:pocket_advanced/computercraft/wireless_modem_normal"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -15,5 +15,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_computer", "has_apple", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:pocket_computer_advanced"]}
|
||||
"rewards": {"recipes": ["computercraft:pocket_computer_advanced"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -13,5 +13,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_components", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:pocket_computer_advanced_upgrade"]}
|
||||
"rewards": {"recipes": ["computercraft:pocket_computer_advanced_upgrade"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -15,5 +15,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_computer", "has_apple", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:pocket_computer_normal"]}
|
||||
"rewards": {"recipes": ["computercraft:pocket_computer_normal"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -13,5 +13,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_items", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:pocket_normal/computercraft/speaker"]}
|
||||
"rewards": {"recipes": ["computercraft:pocket_normal/computercraft/speaker"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -16,5 +16,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_items", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:pocket_normal/computercraft/wireless_modem_advanced"]}
|
||||
"rewards": {"recipes": ["computercraft:pocket_normal/computercraft/wireless_modem_advanced"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -16,5 +16,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_items", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:pocket_normal/computercraft/wireless_modem_normal"]}
|
||||
"rewards": {"recipes": ["computercraft:pocket_normal/computercraft/wireless_modem_normal"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -11,5 +11,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_printer", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:printed_book"]}
|
||||
"rewards": {"recipes": ["computercraft:printed_book"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -11,5 +11,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_printer", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:printed_pages"]}
|
||||
"rewards": {"recipes": ["computercraft:printed_pages"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -8,5 +8,6 @@
|
||||
"has_the_recipe": {"conditions": {"recipe": "computercraft:printer"}, "trigger": "minecraft:recipe_unlocked"}
|
||||
},
|
||||
"requirements": [["has_computer", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:printer"]}
|
||||
"rewards": {"recipes": ["computercraft:printer"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -8,5 +8,6 @@
|
||||
"has_the_recipe": {"conditions": {"recipe": "computercraft:speaker"}, "trigger": "minecraft:recipe_unlocked"}
|
||||
},
|
||||
"requirements": [["has_computer", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:speaker"]}
|
||||
"rewards": {"recipes": ["computercraft:speaker"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -11,5 +11,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_computer", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:turtle_advanced"]}
|
||||
"rewards": {"recipes": ["computercraft:turtle_advanced"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -13,5 +13,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_items", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:turtle_advanced/computercraft/speaker"]}
|
||||
"rewards": {"recipes": ["computercraft:turtle_advanced/computercraft/speaker"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -16,5 +16,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_items", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:turtle_advanced/computercraft/wireless_modem_advanced"]}
|
||||
"rewards": {"recipes": ["computercraft:turtle_advanced/computercraft/wireless_modem_advanced"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -16,5 +16,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_items", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:turtle_advanced/computercraft/wireless_modem_normal"]}
|
||||
"rewards": {"recipes": ["computercraft:turtle_advanced/computercraft/wireless_modem_normal"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -13,5 +13,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_items", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:turtle_advanced/minecraft/crafting_table"]}
|
||||
"rewards": {"recipes": ["computercraft:turtle_advanced/minecraft/crafting_table"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -13,5 +13,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_items", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:turtle_advanced/minecraft/diamond_axe"]}
|
||||
"rewards": {"recipes": ["computercraft:turtle_advanced/minecraft/diamond_axe"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -13,5 +13,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_items", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:turtle_advanced/minecraft/diamond_hoe"]}
|
||||
"rewards": {"recipes": ["computercraft:turtle_advanced/minecraft/diamond_hoe"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -13,5 +13,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_items", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:turtle_advanced/minecraft/diamond_pickaxe"]}
|
||||
"rewards": {"recipes": ["computercraft:turtle_advanced/minecraft/diamond_pickaxe"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -13,5 +13,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_items", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:turtle_advanced/minecraft/diamond_shovel"]}
|
||||
"rewards": {"recipes": ["computercraft:turtle_advanced/minecraft/diamond_shovel"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -13,5 +13,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_items", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:turtle_advanced/minecraft/diamond_sword"]}
|
||||
"rewards": {"recipes": ["computercraft:turtle_advanced/minecraft/diamond_sword"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -12,5 +12,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_turtle", "has_dye", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:turtle_advanced_overlays/turtle_rainbow_overlay"]}
|
||||
"rewards": {"recipes": ["computercraft:turtle_advanced_overlays/turtle_rainbow_overlay"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -12,5 +12,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_turtle", "has_dye", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:turtle_advanced_overlays/turtle_trans_overlay"]}
|
||||
"rewards": {"recipes": ["computercraft:turtle_advanced_overlays/turtle_trans_overlay"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -11,5 +11,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_components", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:turtle_advanced_upgrade"]}
|
||||
"rewards": {"recipes": ["computercraft:turtle_advanced_upgrade"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -11,5 +11,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_computer", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:turtle_normal"]}
|
||||
"rewards": {"recipes": ["computercraft:turtle_normal"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -13,5 +13,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_items", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:turtle_normal/computercraft/speaker"]}
|
||||
"rewards": {"recipes": ["computercraft:turtle_normal/computercraft/speaker"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -16,5 +16,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_items", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:turtle_normal/computercraft/wireless_modem_advanced"]}
|
||||
"rewards": {"recipes": ["computercraft:turtle_normal/computercraft/wireless_modem_advanced"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -16,5 +16,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_items", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:turtle_normal/computercraft/wireless_modem_normal"]}
|
||||
"rewards": {"recipes": ["computercraft:turtle_normal/computercraft/wireless_modem_normal"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -13,5 +13,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_items", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:turtle_normal/minecraft/crafting_table"]}
|
||||
"rewards": {"recipes": ["computercraft:turtle_normal/minecraft/crafting_table"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -13,5 +13,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_items", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:turtle_normal/minecraft/diamond_axe"]}
|
||||
"rewards": {"recipes": ["computercraft:turtle_normal/minecraft/diamond_axe"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -13,5 +13,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_items", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:turtle_normal/minecraft/diamond_hoe"]}
|
||||
"rewards": {"recipes": ["computercraft:turtle_normal/minecraft/diamond_hoe"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -13,5 +13,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_items", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:turtle_normal/minecraft/diamond_pickaxe"]}
|
||||
"rewards": {"recipes": ["computercraft:turtle_normal/minecraft/diamond_pickaxe"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -13,5 +13,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_items", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:turtle_normal/minecraft/diamond_shovel"]}
|
||||
"rewards": {"recipes": ["computercraft:turtle_normal/minecraft/diamond_shovel"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -13,5 +13,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_items", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:turtle_normal/minecraft/diamond_sword"]}
|
||||
"rewards": {"recipes": ["computercraft:turtle_normal/minecraft/diamond_sword"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -12,5 +12,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_turtle", "has_dye", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:turtle_normal_overlays/turtle_rainbow_overlay"]}
|
||||
"rewards": {"recipes": ["computercraft:turtle_normal_overlays/turtle_rainbow_overlay"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -12,5 +12,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_turtle", "has_dye", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:turtle_normal_overlays/turtle_trans_overlay"]}
|
||||
"rewards": {"recipes": ["computercraft:turtle_normal_overlays/turtle_trans_overlay"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -15,5 +15,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_computer", "has_cable", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:wired_modem"]}
|
||||
"rewards": {"recipes": ["computercraft:wired_modem"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -11,5 +11,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_modem", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:wired_modem_full_from"]}
|
||||
"rewards": {"recipes": ["computercraft:wired_modem_full_from"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -11,5 +11,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_modem", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:wired_modem_full_to"]}
|
||||
"rewards": {"recipes": ["computercraft:wired_modem_full_to"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -15,5 +15,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_computer", "has_wireless", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:wireless_modem_advanced"]}
|
||||
"rewards": {"recipes": ["computercraft:wireless_modem_advanced"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
@@ -11,5 +11,6 @@
|
||||
}
|
||||
},
|
||||
"requirements": [["has_computer", "has_the_recipe"]],
|
||||
"rewards": {"recipes": ["computercraft:wireless_modem_normal"]}
|
||||
"rewards": {"recipes": ["computercraft:wireless_modem_normal"]},
|
||||
"sends_telemetry_event": false
|
||||
}
|
||||
|
||||
21
projects/forge/src/generated/resources/data/computercraft/loot_modifiers/treasure_disk.json
generated
Normal file
21
projects/forge/src/generated/resources/data/computercraft/loot_modifiers/treasure_disk.json
generated
Normal file
@@ -0,0 +1,21 @@
|
||||
{
|
||||
"type": "computercraft:inject_loot_table",
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "minecraft:any_of",
|
||||
"terms": [
|
||||
{"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/simple_dungeon"},
|
||||
{"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/abandoned_mineshaft"},
|
||||
{"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/stronghold_corridor"},
|
||||
{"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/woodland_mansion"},
|
||||
{"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/stronghold_library"},
|
||||
{"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/stronghold_crossing"},
|
||||
{"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/desert_pyramid"},
|
||||
{"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/jungle_temple"},
|
||||
{"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/igloo_chest"},
|
||||
{"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/village/village_cartographer"}
|
||||
]
|
||||
}
|
||||
],
|
||||
"loot_table": "computercraft:treasure_disk"
|
||||
}
|
||||
@@ -30,5 +30,6 @@
|
||||
"entries": [{"type": "minecraft:item", "name": "computercraft:wired_modem"}],
|
||||
"rolls": 1.0
|
||||
}
|
||||
]
|
||||
],
|
||||
"random_sequence": "computercraft:blocks/cable"
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
"bonus_rolls": 0.0,
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "minecraft:alternative",
|
||||
"condition": "minecraft:any_of",
|
||||
"terms": [
|
||||
{"condition": "computercraft:block_named"},
|
||||
{"condition": "computercraft:has_id"},
|
||||
@@ -16,5 +16,6 @@
|
||||
"entries": [{"type": "minecraft:dynamic", "name": "computercraft:computer"}],
|
||||
"rolls": 1.0
|
||||
}
|
||||
]
|
||||
],
|
||||
"random_sequence": "computercraft:blocks/computer_advanced"
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
"bonus_rolls": 0.0,
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "minecraft:alternative",
|
||||
"condition": "minecraft:any_of",
|
||||
"terms": [
|
||||
{"condition": "computercraft:block_named"},
|
||||
{"condition": "computercraft:has_id"},
|
||||
@@ -16,5 +16,6 @@
|
||||
"entries": [{"type": "minecraft:dynamic", "name": "computercraft:computer"}],
|
||||
"rolls": 1.0
|
||||
}
|
||||
]
|
||||
],
|
||||
"random_sequence": "computercraft:blocks/computer_command"
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
"bonus_rolls": 0.0,
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "minecraft:alternative",
|
||||
"condition": "minecraft:any_of",
|
||||
"terms": [
|
||||
{"condition": "computercraft:block_named"},
|
||||
{"condition": "computercraft:has_id"},
|
||||
@@ -16,5 +16,6 @@
|
||||
"entries": [{"type": "minecraft:dynamic", "name": "computercraft:computer"}],
|
||||
"rolls": 1.0
|
||||
}
|
||||
]
|
||||
],
|
||||
"random_sequence": "computercraft:blocks/computer_normal"
|
||||
}
|
||||
|
||||
@@ -13,5 +13,6 @@
|
||||
],
|
||||
"rolls": 1.0
|
||||
}
|
||||
]
|
||||
],
|
||||
"random_sequence": "computercraft:blocks/disk_drive"
|
||||
}
|
||||
|
||||
@@ -7,5 +7,6 @@
|
||||
"entries": [{"type": "minecraft:item", "name": "computercraft:monitor_advanced"}],
|
||||
"rolls": 1.0
|
||||
}
|
||||
]
|
||||
],
|
||||
"random_sequence": "computercraft:blocks/monitor_advanced"
|
||||
}
|
||||
|
||||
@@ -7,5 +7,6 @@
|
||||
"entries": [{"type": "minecraft:item", "name": "computercraft:monitor_normal"}],
|
||||
"rolls": 1.0
|
||||
}
|
||||
]
|
||||
],
|
||||
"random_sequence": "computercraft:blocks/monitor_normal"
|
||||
}
|
||||
|
||||
@@ -13,5 +13,6 @@
|
||||
],
|
||||
"rolls": 1.0
|
||||
}
|
||||
]
|
||||
],
|
||||
"random_sequence": "computercraft:blocks/printer"
|
||||
}
|
||||
|
||||
@@ -7,5 +7,6 @@
|
||||
"entries": [{"type": "minecraft:item", "name": "computercraft:speaker"}],
|
||||
"rolls": 1.0
|
||||
}
|
||||
]
|
||||
],
|
||||
"random_sequence": "computercraft:blocks/speaker"
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
"bonus_rolls": 0.0,
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "minecraft:alternative",
|
||||
"condition": "minecraft:any_of",
|
||||
"terms": [
|
||||
{"condition": "computercraft:block_named"},
|
||||
{"condition": "computercraft:has_id"},
|
||||
@@ -16,5 +16,6 @@
|
||||
"entries": [{"type": "minecraft:dynamic", "name": "computercraft:computer"}],
|
||||
"rolls": 1.0
|
||||
}
|
||||
]
|
||||
],
|
||||
"random_sequence": "computercraft:blocks/turtle_advanced"
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
"bonus_rolls": 0.0,
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "minecraft:alternative",
|
||||
"condition": "minecraft:any_of",
|
||||
"terms": [
|
||||
{"condition": "computercraft:block_named"},
|
||||
{"condition": "computercraft:has_id"},
|
||||
@@ -16,5 +16,6 @@
|
||||
"entries": [{"type": "minecraft:dynamic", "name": "computercraft:computer"}],
|
||||
"rolls": 1.0
|
||||
}
|
||||
]
|
||||
],
|
||||
"random_sequence": "computercraft:blocks/turtle_normal"
|
||||
}
|
||||
|
||||
@@ -7,5 +7,6 @@
|
||||
"entries": [{"type": "minecraft:item", "name": "computercraft:wired_modem_full"}],
|
||||
"rolls": 1.0
|
||||
}
|
||||
]
|
||||
],
|
||||
"random_sequence": "computercraft:blocks/wired_modem_full"
|
||||
}
|
||||
|
||||
@@ -7,5 +7,6 @@
|
||||
"entries": [{"type": "minecraft:item", "name": "computercraft:wireless_modem_advanced"}],
|
||||
"rolls": 1.0
|
||||
}
|
||||
]
|
||||
],
|
||||
"random_sequence": "computercraft:blocks/wireless_modem_advanced"
|
||||
}
|
||||
|
||||
@@ -7,5 +7,6 @@
|
||||
"entries": [{"type": "minecraft:item", "name": "computercraft:wireless_modem_normal"}],
|
||||
"rolls": 1.0
|
||||
}
|
||||
]
|
||||
],
|
||||
"random_sequence": "computercraft:blocks/wireless_modem_normal"
|
||||
}
|
||||
|
||||
@@ -1 +1 @@
|
||||
{}
|
||||
{"random_sequence": "computercraft:treasure_disk"}
|
||||
|
||||
1
projects/forge/src/generated/resources/data/forge/loot_modifiers/global_loot_modifiers.json
generated
Normal file
1
projects/forge/src/generated/resources/data/forge/loot_modifiers/global_loot_modifiers.json
generated
Normal file
@@ -0,0 +1 @@
|
||||
{"entries": ["computercraft:treasure_disk"], "replace": false}
|
||||
@@ -12,6 +12,7 @@ import dan200.computercraft.api.network.wired.WiredElement;
|
||||
import dan200.computercraft.api.peripheral.IPeripheral;
|
||||
import dan200.computercraft.api.pocket.PocketUpgradeSerialiser;
|
||||
import dan200.computercraft.api.turtle.TurtleUpgradeSerialiser;
|
||||
import dan200.computercraft.shared.ForgeModRegistry;
|
||||
import dan200.computercraft.shared.ModRegistry;
|
||||
import dan200.computercraft.shared.config.ConfigSpec;
|
||||
import dan200.computercraft.shared.details.FluidData;
|
||||
@@ -20,10 +21,8 @@ import dan200.computercraft.shared.peripheral.generic.methods.FluidMethods;
|
||||
import dan200.computercraft.shared.peripheral.generic.methods.InventoryMethods;
|
||||
import dan200.computercraft.shared.platform.ForgeConfigFile;
|
||||
import dan200.computercraft.shared.platform.NetworkHandler;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraftforge.common.capabilities.ForgeCapabilities;
|
||||
import net.minecraftforge.common.capabilities.RegisterCapabilitiesEvent;
|
||||
import net.minecraftforge.event.CreativeModeTabEvent;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.ModLoadingContext;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
@@ -38,6 +37,7 @@ import net.minecraftforge.registries.RegistryBuilder;
|
||||
public final class ComputerCraft {
|
||||
public ComputerCraft() {
|
||||
ModRegistry.register();
|
||||
ForgeModRegistry.register();
|
||||
|
||||
ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, ((ForgeConfigFile) ConfigSpec.serverSpec).spec());
|
||||
ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, ((ForgeConfigFile) ConfigSpec.clientSpec).spec());
|
||||
@@ -62,11 +62,6 @@ public final class ComputerCraft {
|
||||
event.register(IPeripheral.class);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void registerCreativeTab(CreativeModeTabEvent.Register event) {
|
||||
event.registerCreativeModeTab(new ResourceLocation(ComputerCraftAPI.MOD_ID, "tab"), ModRegistry::registerCreativeTab);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void init(FMLCommonSetupEvent event) {
|
||||
event.enqueueWork(ModRegistry::registerMainThread);
|
||||
|
||||
@@ -34,6 +34,8 @@ public class Generators {
|
||||
public static void gather(GatherDataEvent event) {
|
||||
var generator = event.getGenerator();
|
||||
DataProviders.add(new GeneratorFactoryImpl(generator.getVanillaPack(true), event.getExistingFileHelper(), event.getLookupProvider()));
|
||||
|
||||
generator.<LootModifierProvider>addProvider(event.includeServer(), LootModifierProvider::new);
|
||||
}
|
||||
|
||||
private record GeneratorFactoryImpl(
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
|
||||
//
|
||||
// SPDX-License-Identifier: MPL-2.0
|
||||
|
||||
package dan200.computercraft.data;
|
||||
|
||||
import dan200.computercraft.api.ComputerCraftAPI;
|
||||
import dan200.computercraft.shared.CommonHooks;
|
||||
import dan200.computercraft.shared.loot.InjectLootTableModifier;
|
||||
import net.minecraft.data.PackOutput;
|
||||
import net.minecraft.world.level.storage.loot.predicates.AnyOfCondition;
|
||||
import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
|
||||
import net.minecraftforge.common.data.GlobalLootModifierProvider;
|
||||
import net.minecraftforge.common.loot.LootTableIdCondition;
|
||||
|
||||
final class LootModifierProvider extends GlobalLootModifierProvider {
|
||||
LootModifierProvider(PackOutput output) {
|
||||
super(output, ComputerCraftAPI.MOD_ID);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void start() {
|
||||
add("treasure_disk", new InjectLootTableModifier(
|
||||
new LootItemCondition[]{
|
||||
AnyOfCondition.anyOf(
|
||||
CommonHooks.TREASURE_DISK_LOOT_TABLES.stream().map(LootTableIdCondition::builder).toArray(LootItemCondition.Builder[]::new)
|
||||
).build(),
|
||||
},
|
||||
CommonHooks.TREASURE_DISK_LOOT
|
||||
));
|
||||
}
|
||||
}
|
||||
@@ -138,12 +138,6 @@ public class ForgeCommonHooks {
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void lootLoad(LootTableLoadEvent event) {
|
||||
var pool = CommonHooks.getExtraLootPool(event.getName());
|
||||
if (pool != null) event.getTable().addPool(pool.build());
|
||||
}
|
||||
|
||||
@SubscribeEvent(priority = EventPriority.HIGHEST)
|
||||
public static void onEntitySpawn(EntityJoinLevelEvent event) {
|
||||
if (CommonHooks.onEntitySpawn(event.getEntity())) event.setCanceled(true);
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
|
||||
//
|
||||
// SPDX-License-Identifier: MPL-2.0
|
||||
|
||||
package dan200.computercraft.shared;
|
||||
|
||||
import com.mojang.serialization.Codec;
|
||||
import dan200.computercraft.shared.loot.InjectLootTableModifier;
|
||||
import dan200.computercraft.shared.platform.PlatformHelper;
|
||||
import dan200.computercraft.shared.platform.RegistrationHelper;
|
||||
import dan200.computercraft.shared.platform.RegistryEntry;
|
||||
import net.minecraftforge.common.loot.IGlobalLootModifier;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
|
||||
/**
|
||||
* {@link ModRegistry} equivalent for Forge-specific content.
|
||||
*/
|
||||
public final class ForgeModRegistry {
|
||||
private ForgeModRegistry() {
|
||||
}
|
||||
|
||||
public static final class Codecs {
|
||||
static final RegistrationHelper<Codec<? extends IGlobalLootModifier>> REGISTRY = PlatformHelper.get().createRegistrationHelper(ForgeRegistries.Keys.GLOBAL_LOOT_MODIFIER_SERIALIZERS);
|
||||
|
||||
public static final RegistryEntry<Codec<InjectLootTableModifier>> INJECT_LOOT_TABLE = REGISTRY.register("inject_loot_table", InjectLootTableModifier::createCodec);
|
||||
}
|
||||
|
||||
public static void register() {
|
||||
Codecs.REGISTRY.register();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
|
||||
//
|
||||
// SPDX-License-Identifier: MPL-2.0
|
||||
|
||||
package dan200.computercraft.shared.loot;
|
||||
|
||||
import com.mojang.serialization.Codec;
|
||||
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||
import dan200.computercraft.shared.ForgeModRegistry;
|
||||
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.level.storage.loot.LootContext;
|
||||
import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
|
||||
import net.minecraftforge.common.loot.LootModifier;
|
||||
|
||||
/**
|
||||
* A {@link LootModifier} which adds a new loot pool to a piece of loot.
|
||||
*/
|
||||
public final class InjectLootTableModifier extends LootModifier {
|
||||
private final ResourceLocation location;
|
||||
|
||||
public InjectLootTableModifier(LootItemCondition[] conditionsIn, ResourceLocation location) {
|
||||
super(conditionsIn);
|
||||
this.location = location;
|
||||
}
|
||||
|
||||
public static Codec<InjectLootTableModifier> createCodec() {
|
||||
return RecordCodecBuilder.create(inst -> LootModifier.codecStart(inst).and(
|
||||
ResourceLocation.CODEC.fieldOf("loot_table").forGetter(m -> m.location)
|
||||
).apply(inst, InjectLootTableModifier::new)
|
||||
);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected ObjectArrayList<ItemStack> doApply(ObjectArrayList<ItemStack> generatedLoot, LootContext context) {
|
||||
context.getResolver().getLootTable(location).getRandomItemsRaw(context, generatedLoot::add);
|
||||
return generatedLoot;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Codec<InjectLootTableModifier> codec() {
|
||||
return ForgeModRegistry.Codecs.INJECT_LOOT_TABLE.get();
|
||||
}
|
||||
}
|
||||
@@ -52,7 +52,6 @@ import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.level.chunk.LevelChunk;
|
||||
import net.minecraft.world.phys.BlockHitResult;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
import net.minecraftforge.common.CreativeModeTabRegistry;
|
||||
import net.minecraftforge.common.ForgeHooks;
|
||||
import net.minecraftforge.common.Tags;
|
||||
import net.minecraftforge.common.ToolActions;
|
||||
@@ -258,10 +257,10 @@ public class PlatformHelperImpl implements PlatformHelper {
|
||||
return ForgeHooks.getBurnTime(stack, null);
|
||||
}
|
||||
|
||||
@Nullable
|
||||
|
||||
@Override
|
||||
public ResourceLocation getCreativeTabId(CreativeModeTab tab) {
|
||||
return CreativeModeTabRegistry.getName(tab);
|
||||
public CreativeModeTab.Builder newCreativeModeTab() {
|
||||
return CreativeModeTab.builder();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -321,7 +320,7 @@ public class PlatformHelperImpl implements PlatformHelper {
|
||||
|
||||
@Override
|
||||
public InteractionResult useOn(ServerPlayer player, ItemStack stack, BlockHitResult hit, Predicate<BlockState> canUseBlock) {
|
||||
var level = player.level;
|
||||
var level = player.level();
|
||||
var pos = hit.getBlockPos();
|
||||
var event = ForgeHooks.onRightClickBlock(player, InteractionHand.MAIN_HAND, pos, hit);
|
||||
if (event.isCanceled()) return event.getCancellationResult();
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
# SPDX-License-Identifier: MPL-2.0
|
||||
|
||||
modLoader="javafml"
|
||||
loaderVersion="[45,46)"
|
||||
loaderVersion="[46,47)"
|
||||
|
||||
issueTrackerURL="https://github.com/cc-tweaked/CC-Tweaked/issues"
|
||||
logoFile="pack.png"
|
||||
@@ -26,6 +26,6 @@ CC: Tweaked is a fork of ComputerCraft, adding programmable computers, turtles a
|
||||
[[dependencies.computercraft]]
|
||||
modId="forge"
|
||||
mandatory=true
|
||||
versionRange="[${forgeVersion},46)"
|
||||
versionRange="[${forgeVersion},47)"
|
||||
ordering="NONE"
|
||||
side="BOTH"
|
||||
|
||||
Reference in New Issue
Block a user