mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-01-29 22:35:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'mc1.18/dev' into mc1.19/dev

Browse source
This commit is contained in:
simibubi 2024-08-08 08:24:08 +02:00
commit 3025941258
5 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/generated/resources/data/create/loot_tables/blocks/tiled_glass.json
View file

@ -2,19 +2,29 @@
"type": "minecraft:block", "type": "minecraft:block",
"pools": [ "pools": [
{ {
"rolls": 1.0,
"bonus_rolls": 0.0, "bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [ "entries": [
{ {
"type": "minecraft:item", "type": "minecraft:item",
"name": "create:tiled_glass" "name": "create:tiled_glass"
} }
], ],
"rolls": 1.0 "conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
]
} }
] ]
} }

2
src/generated/resources/data/create/recipes/cutting/compat/upgrade_aquatic/driftwood.json
View file

@ -14,7 +14,7 @@
"processingTime": 50, "processingTime": 50,
"results": [ "results": [
{ {
"item": "upgrade_aquatic:strippped_driftwood" "item": "upgrade_aquatic:stripped_driftwood"
} }
] ]
} }

2
src/generated/resources/data/create/recipes/cutting/compat/upgrade_aquatic/strippped_driftwood.json → src/generated/resources/data/create/recipes/cutting/compat/upgrade_aquatic/stripped_driftwood.json
View file

@ -8,7 +8,7 @@
], ],
"ingredients": [ "ingredients": [
{ {
"item": "upgrade_aquatic:strippped_driftwood" "item": "upgrade_aquatic:stripped_driftwood"
} }
], ],
"processingTime": 50, "processingTime": 50,

1
src/main/java/com/simibubi/create/content/decoration/palettes/AllPaletteBlocks.java
View file

@ -41,6 +41,7 @@ public class AllPaletteBlocks {
.addLayer(() -> RenderType::cutout) .addLayer(() -> RenderType::cutout)
.recipe((c, p) -> p.stonecutting(DataIngredient.tag(Tags.Items.GLASS_COLORLESS), c::get)) .recipe((c, p) -> p.stonecutting(DataIngredient.tag(Tags.Items.GLASS_COLORLESS), c::get))
.blockstate((c, p) -> BlockStateGen.cubeAll(c, p, "palettes/")) .blockstate((c, p) -> BlockStateGen.cubeAll(c, p, "palettes/"))
.loot((t, g) -> t.dropWhenSilkTouch(g))
.tag(Tags.Blocks.GLASS_COLORLESS, BlockTags.IMPERMEABLE) .tag(Tags.Blocks.GLASS_COLORLESS, BlockTags.IMPERMEABLE)
.item() .item()
.tag(Tags.Items.GLASS_COLORLESS) .tag(Tags.Items.GLASS_COLORLESS)

2
src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java
View file

@ -128,7 +128,7 @@ public class CuttingRecipeGen extends ProcessingRecipeGen {
// Upgrade Aquatic // Upgrade Aquatic
UA = cuttingCompat(Mods.UA, "river"), UA = cuttingCompat(Mods.UA, "river"),
UA_2 = stripAndMakePlanks(Mods.UA, "driftwood", "strippped_driftwood", "driftwood_planks"), UA_2 = stripAndMakePlanks(Mods.UA, "driftwood", "stripped_driftwood", "driftwood_planks"),
UA_3 = cuttingCompatLogOnly(Mods.UA, "driftwood"), UA_3 = cuttingCompatLogOnly(Mods.UA, "driftwood"),
//Vault Hunters //Vault Hunters