diff --git a/src/main/resources/assets/dimdoors/lang/en_us.json b/src/main/resources/assets/dimdoors/lang/en_us.json index 4da19ecc..4d1c00fc 100644 --- a/src/main/resources/assets/dimdoors/lang/en_us.json +++ b/src/main/resources/assets/dimdoors/lang/en_us.json @@ -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", diff --git a/src/main/resources/assets/dimdoors/models/item/frayed_filament.json b/src/main/resources/assets/dimdoors/models/item/frayed_filament.json new file mode 100644 index 00000000..c73c4f3a --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/item/frayed_filament.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "dimdoors:item/frayed_filament" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/models/item/infrangible_fiber.json b/src/main/resources/assets/dimdoors/models/item/infrangible_fiber.json new file mode 100644 index 00000000..31d2722d --- /dev/null +++ b/src/main/resources/assets/dimdoors/models/item/infrangible_fiber.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "dimdoors:item/infrangible_fiber" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/dimdoors/textures/item/frayed_filament.png b/src/main/resources/assets/dimdoors/textures/item/frayed_filament.png new file mode 100644 index 00000000..c2ae0e14 Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/item/frayed_filament.png differ diff --git a/src/main/resources/assets/dimdoors/textures/item/infrangible_fiber.png b/src/main/resources/assets/dimdoors/textures/item/infrangible_fiber.png new file mode 100644 index 00000000..8e0620b0 Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/item/infrangible_fiber.png differ diff --git a/src/main/resources/data/dimdoors/decay_patterns/acacia_log.json b/src/main/resources/data/dimdoors/decay_patterns/acacia_log.json index 4928795a..8ebb7b2f 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/acacia_log.json +++ b/src/main/resources/data/dimdoors/decay_patterns/acacia_log.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/acacia_wood.json b/src/main/resources/data/dimdoors/decay_patterns/acacia_wood.json index 73a455c2..bceb29bd 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/acacia_wood.json +++ b/src/main/resources/data/dimdoors/decay_patterns/acacia_wood.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/andesite.json b/src/main/resources/data/dimdoors/decay_patterns/andesite.json index 12338985..190f32ff 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/andesite.json +++ b/src/main/resources/data/dimdoors/decay_patterns/andesite.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/bedrock.json b/src/main/resources/data/dimdoors/decay_patterns/bedrock.json new file mode 100644 index 00000000..016c805a --- /dev/null +++ b/src/main/resources/data/dimdoors/decay_patterns/bedrock.json @@ -0,0 +1,11 @@ +{ + "predicate": { + "block": "minecraft:bedrock", + "type": "dimdoors:simple" + }, + "processor": { + "entropy": 1, + "block": "dimdoors:solid_static", + "type": "dimdoors:simple" + } +} \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/birch_log.json b/src/main/resources/data/dimdoors/decay_patterns/birch_log.json index b9b84152..15673f87 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/birch_log.json +++ b/src/main/resources/data/dimdoors/decay_patterns/birch_log.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/birch_wood.json b/src/main/resources/data/dimdoors/decay_patterns/birch_wood.json index 7f6c80be..775b904c 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/birch_wood.json +++ b/src/main/resources/data/dimdoors/decay_patterns/birch_wood.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/blackstone.json b/src/main/resources/data/dimdoors/decay_patterns/blackstone.json index 15df0dae..ead5ee6f 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/blackstone.json +++ b/src/main/resources/data/dimdoors/decay_patterns/blackstone.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/coal_block.json b/src/main/resources/data/dimdoors/decay_patterns/coal_block.json index 64b108a7..9656a5c1 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/coal_block.json +++ b/src/main/resources/data/dimdoors/decay_patterns/coal_block.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/coal_ore.json b/src/main/resources/data/dimdoors/decay_patterns/coal_ore.json index 0434db70..0fb9b665 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/coal_ore.json +++ b/src/main/resources/data/dimdoors/decay_patterns/coal_ore.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/cobblestone.json b/src/main/resources/data/dimdoors/decay_patterns/cobblestone.json index 7a3f3e8e..e5641b0f 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/cobblestone.json +++ b/src/main/resources/data/dimdoors/decay_patterns/cobblestone.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/cracked_stone_bricks.json b/src/main/resources/data/dimdoors/decay_patterns/cracked_stone_bricks.json index 0a0c24f6..e55964a4 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/cracked_stone_bricks.json +++ b/src/main/resources/data/dimdoors/decay_patterns/cracked_stone_bricks.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/dark_oak_log.json b/src/main/resources/data/dimdoors/decay_patterns/dark_oak_log.json index dadc9961..8d105cc1 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/dark_oak_log.json +++ b/src/main/resources/data/dimdoors/decay_patterns/dark_oak_log.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/dark_oak_wood.json b/src/main/resources/data/dimdoors/decay_patterns/dark_oak_wood.json index dccee4d7..efc9a7ae 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/dark_oak_wood.json +++ b/src/main/resources/data/dimdoors/decay_patterns/dark_oak_wood.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/diorite.json b/src/main/resources/data/dimdoors/decay_patterns/diorite.json index 794e38a6..1af6e357 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/diorite.json +++ b/src/main/resources/data/dimdoors/decay_patterns/diorite.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/dirt.json b/src/main/resources/data/dimdoors/decay_patterns/dirt.json index 4fc66e65..9bce9246 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/dirt.json +++ b/src/main/resources/data/dimdoors/decay_patterns/dirt.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/dirt_path.json b/src/main/resources/data/dimdoors/decay_patterns/dirt_path.json index fabf0b29..479b531d 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/dirt_path.json +++ b/src/main/resources/data/dimdoors/decay_patterns/dirt_path.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/emerald_block.json b/src/main/resources/data/dimdoors/decay_patterns/emerald_block.json index 7e275927..88c3bb09 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/emerald_block.json +++ b/src/main/resources/data/dimdoors/decay_patterns/emerald_block.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/emerald_ore.json b/src/main/resources/data/dimdoors/decay_patterns/emerald_ore.json index 773cde6e..10261c06 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/emerald_ore.json +++ b/src/main/resources/data/dimdoors/decay_patterns/emerald_ore.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/end_stone.json b/src/main/resources/data/dimdoors/decay_patterns/end_stone.json index 85c14f4e..18881b3e 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/end_stone.json +++ b/src/main/resources/data/dimdoors/decay_patterns/end_stone.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/end_stone_bricks.json b/src/main/resources/data/dimdoors/decay_patterns/end_stone_bricks.json index ea33f882..943cff36 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/end_stone_bricks.json +++ b/src/main/resources/data/dimdoors/decay_patterns/end_stone_bricks.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/farmland.json b/src/main/resources/data/dimdoors/decay_patterns/farmland.json index 78487146..3dd1135f 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/farmland.json +++ b/src/main/resources/data/dimdoors/decay_patterns/farmland.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/glass.json b/src/main/resources/data/dimdoors/decay_patterns/glass.json index bdc7b8cc..743e847a 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/glass.json +++ b/src/main/resources/data/dimdoors/decay_patterns/glass.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/gold_block.json b/src/main/resources/data/dimdoors/decay_patterns/gold_block.json index ebd22ee0..f13ecb2f 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/gold_block.json +++ b/src/main/resources/data/dimdoors/decay_patterns/gold_block.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/gold_ore.json b/src/main/resources/data/dimdoors/decay_patterns/gold_ore.json index bf482e41..8c385783 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/gold_ore.json +++ b/src/main/resources/data/dimdoors/decay_patterns/gold_ore.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/granite.json b/src/main/resources/data/dimdoors/decay_patterns/granite.json index cc5fdd92..1594f97f 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/granite.json +++ b/src/main/resources/data/dimdoors/decay_patterns/granite.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/grass_block.json b/src/main/resources/data/dimdoors/decay_patterns/grass_block.json index a9f16015..0c57cebc 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/grass_block.json +++ b/src/main/resources/data/dimdoors/decay_patterns/grass_block.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/gravel.json b/src/main/resources/data/dimdoors/decay_patterns/gravel.json index 7d578c6d..4c1fb961 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/gravel.json +++ b/src/main/resources/data/dimdoors/decay_patterns/gravel.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/iron_block.json b/src/main/resources/data/dimdoors/decay_patterns/iron_block.json index 9e0aed76..22226a97 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/iron_block.json +++ b/src/main/resources/data/dimdoors/decay_patterns/iron_block.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/iron_ore.json b/src/main/resources/data/dimdoors/decay_patterns/iron_ore.json index 5cb74956..bc8968de 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/iron_ore.json +++ b/src/main/resources/data/dimdoors/decay_patterns/iron_ore.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/jungle_log.json b/src/main/resources/data/dimdoors/decay_patterns/jungle_log.json index 7decd3d2..e95e7c2f 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/jungle_log.json +++ b/src/main/resources/data/dimdoors/decay_patterns/jungle_log.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/jungle_wood.json b/src/main/resources/data/dimdoors/decay_patterns/jungle_wood.json index 60c25e3a..d514d729 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/jungle_wood.json +++ b/src/main/resources/data/dimdoors/decay_patterns/jungle_wood.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/lapis_block.json b/src/main/resources/data/dimdoors/decay_patterns/lapis_block.json index 7afba20f..7a109cb8 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/lapis_block.json +++ b/src/main/resources/data/dimdoors/decay_patterns/lapis_block.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/lapis_ore.json b/src/main/resources/data/dimdoors/decay_patterns/lapis_ore.json index bae1b8b7..9bc73641 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/lapis_ore.json +++ b/src/main/resources/data/dimdoors/decay_patterns/lapis_ore.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/oak_log.json b/src/main/resources/data/dimdoors/decay_patterns/oak_log.json index c1b98c2e..e2762a7a 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/oak_log.json +++ b/src/main/resources/data/dimdoors/decay_patterns/oak_log.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/oak_wood.json b/src/main/resources/data/dimdoors/decay_patterns/oak_wood.json index 03cc3fd5..5ff5d892 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/oak_wood.json +++ b/src/main/resources/data/dimdoors/decay_patterns/oak_wood.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/podzol.json b/src/main/resources/data/dimdoors/decay_patterns/podzol.json index 267cbf29..db414917 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/podzol.json +++ b/src/main/resources/data/dimdoors/decay_patterns/podzol.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/polished_andesite.json b/src/main/resources/data/dimdoors/decay_patterns/polished_andesite.json index 4c44fbd7..45a16d17 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/polished_andesite.json +++ b/src/main/resources/data/dimdoors/decay_patterns/polished_andesite.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/polished_blackstone.json b/src/main/resources/data/dimdoors/decay_patterns/polished_blackstone.json index 7ffa3894..cbbadd91 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/polished_blackstone.json +++ b/src/main/resources/data/dimdoors/decay_patterns/polished_blackstone.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/polished_diorite.json b/src/main/resources/data/dimdoors/decay_patterns/polished_diorite.json index 49b39b43..eaafafe0 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/polished_diorite.json +++ b/src/main/resources/data/dimdoors/decay_patterns/polished_diorite.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/polished_granite.json b/src/main/resources/data/dimdoors/decay_patterns/polished_granite.json index 2abdfe60..d5ef444a 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/polished_granite.json +++ b/src/main/resources/data/dimdoors/decay_patterns/polished_granite.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/redstone_block.json b/src/main/resources/data/dimdoors/decay_patterns/redstone_block.json index c4bc256f..42057cc5 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/redstone_block.json +++ b/src/main/resources/data/dimdoors/decay_patterns/redstone_block.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/redstone_ore.json b/src/main/resources/data/dimdoors/decay_patterns/redstone_ore.json index 822fc4f6..e4df54b6 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/redstone_ore.json +++ b/src/main/resources/data/dimdoors/decay_patterns/redstone_ore.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/sand.json b/src/main/resources/data/dimdoors/decay_patterns/sand.json index 60f93e96..0b2487c2 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/sand.json +++ b/src/main/resources/data/dimdoors/decay_patterns/sand.json @@ -1,7 +1,7 @@ { "predicate": { - "type": "dimdoors:simple", - "block": "minecraft:sand" + "block": "minecraft:sand", + "type": "dimdoors:simple" }, "processor": { "type": "dimdoors:self" diff --git a/src/main/resources/data/dimdoors/decay_patterns/sandstone.json b/src/main/resources/data/dimdoors/decay_patterns/sandstone.json index f180a808..ef3bbb1b 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/sandstone.json +++ b/src/main/resources/data/dimdoors/decay_patterns/sandstone.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/spruce_log.json b/src/main/resources/data/dimdoors/decay_patterns/spruce_log.json index fa604b70..1f4d067f 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/spruce_log.json +++ b/src/main/resources/data/dimdoors/decay_patterns/spruce_log.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/spruce_wood.json b/src/main/resources/data/dimdoors/decay_patterns/spruce_wood.json index fdf49ab0..5add2165 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/spruce_wood.json +++ b/src/main/resources/data/dimdoors/decay_patterns/spruce_wood.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/stone.json b/src/main/resources/data/dimdoors/decay_patterns/stone.json index 7a24a524..4d3ddfe3 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/stone.json +++ b/src/main/resources/data/dimdoors/decay_patterns/stone.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/decay_patterns/stone_bricks.json b/src/main/resources/data/dimdoors/decay_patterns/stone_bricks.json index 5d7adae4..fcdf4923 100644 --- a/src/main/resources/data/dimdoors/decay_patterns/stone_bricks.json +++ b/src/main/resources/data/dimdoors/decay_patterns/stone_bricks.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/loot_tables/blocks/solid_static.json b/src/main/resources/data/dimdoors/loot_tables/blocks/solid_static.json index 354a17fc..3374ea23 100644 --- a/src/main/resources/data/dimdoors/loot_tables/blocks/solid_static.json +++ b/src/main/resources/data/dimdoors/loot_tables/blocks/solid_static.json @@ -2,19 +2,48 @@ "type": "minecraft:block", "pools": [ { - "rolls": 3.0, - "bonus_rolls": 3.0, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { - "type": "minecraft:item", - "name": "dimdoors:world_thread" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "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" + } + ] } ] } ] -} +} \ No newline at end of file diff --git a/src/main/resources/data/dimdoors/loot_tables/blocks/unravelled_fabric.json b/src/main/resources/data/dimdoors/loot_tables/blocks/unravelled_fabric.json new file mode 100644 index 00000000..6e9a59d9 --- /dev/null +++ b/src/main/resources/data/dimdoors/loot_tables/blocks/unravelled_fabric.json @@ -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" + } + ] + } + ] + } + ] + } + ] +} \ No newline at end of file