Merge remote-tracking branch 'origin/1.17' into 1.17

This commit is contained in:
CreepyCre 2021-10-25 23:55:24 +02:00
commit f459ace615
56 changed files with 323 additions and 198 deletions

View file

@ -70,6 +70,12 @@ public final class ModItems {
@RegistryEntry("world_thread")
public static final Item WORLD_THREAD = create(new Item(new Item.Settings().group(DIMENSIONAL_DOORS)));
@RegistryEntry("infrangible_fiber")
public static final Item INFRANGIBLE_FIBER = create(new Item(new Item.Settings().group(DIMENSIONAL_DOORS)));
@RegistryEntry("frayed_filament")
public static final Item FRAYED_FILAMENT = create(new Item(new Item.Settings().group(DIMENSIONAL_DOORS)));
@RegistryEntry("rift_configuration_tool")
public static final Item RIFT_CONFIGURATION_TOOL = create(new RiftConfigurationToolItem());

View file

@ -81,6 +81,8 @@
"item.dimdoors.rift_blade": "Rift Blade",
"item.dimdoors.rift_blade.rift_miss": "You can only use this item on a rift's core",
"item.dimdoors.world_thread": "World Thread",
"item.dimdoors.infrangible_fiber": "Infrangible Fiber",
"item.dimdoors.frayed_filament": "Frayed Filament",
"item.dimdoors.stable_fabric": "Stable Fabric",
"item.dimdoors.world_thread_boots": "Woven World Thread Boots",
"item.dimdoors.world_thread_helmet": "Woven World Thread Helmet",

View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "dimdoors:item/frayed_filament"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "dimdoors:item/infrangible_fiber"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 673 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 314 B

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:acacia_log"
"block": "minecraft:acacia_log",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:acacia_planks",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:acacia_wood"
"block": "minecraft:acacia_wood",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:acacia_log",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:andesite"
"block": "minecraft:andesite",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:diorite",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -0,0 +1,11 @@
{
"predicate": {
"block": "minecraft:bedrock",
"type": "dimdoors:simple"
},
"processor": {
"entropy": 1,
"block": "dimdoors:solid_static",
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:birch_log"
"block": "minecraft:birch_log",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:birch_planks",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:birch_wood"
"block": "minecraft:birch_wood",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:birch_log",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:blackstone"
"block": "minecraft:blackstone",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:cobblestone",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:coal_block"
"block": "minecraft:coal_block",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:coal_ore",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:coal_ore"
"block": "minecraft:coal_ore",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:stone",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:cobblestone"
"block": "minecraft:cobblestone",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"block": "minecraft:end_stone",
"entropy": 1
"entropy": 1,
"block": "minecraft:gravel",
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:cracked_stone_bricks"
"block": "minecraft:cracked_stone_bricks",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:diorite",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:dark_oak_log"
"block": "minecraft:dark_oak_log",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:dark_oak_planks",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:dark_oak_wood"
"block": "minecraft:dark_oak_wood",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:dark_oak_log",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:diorite"
"block": "minecraft:diorite",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:cobblestone",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:dirt"
"block": "minecraft:dirt",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:sand",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:dirt_path"
"block": "minecraft:dirt_path",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:dirt",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:emerald_block"
"block": "minecraft:emerald_block",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:emerald_ore",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:emerald_ore"
"block": "minecraft:emerald_ore",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:stone",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:end_stone"
"block": "minecraft:end_stone",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"block": "minecraft:sand",
"entropy": 1
"entropy": 1,
"block": "minecraft:sandstone",
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:end_stone_bricks"
"block": "minecraft:end_stone_bricks",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:end_stone",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:farmland"
"block": "minecraft:farmland",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:dirt",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:glass"
"block": "minecraft:glass",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:sand",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:gold_block"
"block": "minecraft:gold_block",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:gold_ore",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:gold_ore"
"block": "minecraft:gold_ore",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:stone",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:granite"
"block": "minecraft:granite",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:diorite",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:grass_block"
"block": "minecraft:grass_block",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:dirt",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:gravel"
"block": "minecraft:gravel",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:sand",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:iron_block"
"block": "minecraft:iron_block",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:iron_ore",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:iron_ore"
"block": "minecraft:iron_ore",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:stone",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:jungle_log"
"block": "minecraft:jungle_log",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:jungle_planks",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:jungle_wood"
"block": "minecraft:jungle_wood",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:jungle_log",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:lapis_block"
"block": "minecraft:lapis_block",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:lapis_ore",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:lapis_ore"
"block": "minecraft:lapis_ore",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:stone",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:oak_log"
"block": "minecraft:oak_log",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:oak_planks",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:oak_wood"
"block": "minecraft:oak_wood",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:oak_log",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:podzol"
"block": "minecraft:podzol",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:dirt",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:polished_andesite"
"block": "minecraft:polished_andesite",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:andesite",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:polished_blackstone"
"block": "minecraft:polished_blackstone",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:blackstone",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:polished_diorite"
"block": "minecraft:polished_diorite",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:diorite",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:polished_granite"
"block": "minecraft:polished_granite",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:granite",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:redstone_block"
"block": "minecraft:redstone_block",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:redstone_ore",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:redstone_ore"
"block": "minecraft:redstone_ore",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:stone",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,7 +1,7 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:sand"
"block": "minecraft:sand",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:self"

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:sandstone"
"block": "minecraft:sandstone",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:sand",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:spruce_log"
"block": "minecraft:spruce_log",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:spruce_planks",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:spruce_wood"
"block": "minecraft:spruce_wood",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:spruce_log",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:stone"
"block": "minecraft:stone",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:cobblestone",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -1,11 +1,11 @@
{
"predicate": {
"type": "dimdoors:simple",
"block": "minecraft:stone_bricks"
"block": "minecraft:stone_bricks",
"type": "dimdoors:simple"
},
"processor": {
"type": "dimdoors:simple",
"entropy": 1,
"block": "minecraft:cracked_stone_bricks",
"entropy": 1
"type": "dimdoors:simple"
}
}

View file

@ -2,17 +2,46 @@
"type": "minecraft:block",
"pools": [
{
"rolls": 3.0,
"bonus_rolls": 3.0,
"rolls": 1.0,
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"name": "dimdoors:world_thread"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
],
"name": "dimdoors:solid_static"
},
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:apply_bonus",
"enchantment": "minecraft:fortune",
"formula": "minecraft:ore_drops"
},
{
"function": "minecraft:explosion_decay"
}
],
"name": "dimdoors:infrangible_fiber"
}
]
}
]
}

View file

@ -0,0 +1,65 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1.0,
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
],
"name": "dimdoors:unravelled_fabric"
},
{
"type": "minecraft:alternatives",
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:table_bonus",
"enchantment": "minecraft:fortune",
"chances": [
0.1,
0.14285715,
0.25,
1.0
]
}
],
"name": "dimdoors:frayed_filament"
},
{
"type": "minecraft:item",
"name": "dimdoors:unravelled_fabric"
}
]
}
]
}
]
}
]
}