diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/bcircuit.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/bcircuit.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/bcircuit.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/bcircuit.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/bwireframe.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/bwireframe.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/bwireframe.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/bwireframe.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/cables.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/cables.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/cables.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/cables.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/caution.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/caution.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/caution.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/caution.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/circuit.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/circuit.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/circuit.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/circuit.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/engineer.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/engineer.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/engineer.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/engineer.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/exhaust.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/exhaust.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/exhaust.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/exhaust.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/factory.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/factory.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/factory.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/factory.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/fan.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/fan.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/fan.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/fan.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/fan_four.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/fan_four.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/fan_four.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/fan_four.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/fan_four_on.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/fan_four_on.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/fan_four_on.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/fan_four_on.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/fan_malfunction.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/fan_malfunction.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/fan_malfunction.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/fan_malfunction.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/fan_malfunction_on.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/fan_malfunction_on.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/fan_malfunction_on.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/fan_malfunction_on.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/fan_on.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/fan_on.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/fan_on.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/fan_on.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/fan_side.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/fan_side.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/fan_side.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/fan_side.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/gcircuit.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/gcircuit.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/gcircuit.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/gcircuit.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/gears.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/gears.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/gears.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/gears.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/grate.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/grate.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/grate.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/grate.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/grinder.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/grinder.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/grinder.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/grinder.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/gvent.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/gvent.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/gvent.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/gvent.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/hazard.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/hazard.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/hazard.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/hazard.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/hazardo.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/hazardo.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/hazardo.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/hazardo.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/hex.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/hex.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/hex.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/hex.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/ice.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/ice.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/ice.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/ice.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/insulation.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/insulation.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/insulation.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/insulation.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/large_pipes.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/large_pipes.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/large_pipes.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/large_pipes.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/large_plating.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/large_plating.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/large_plating.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/large_plating.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/medium_fan.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/medium_fan.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/medium_fan.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/medium_fan.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/megacell.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/megacell.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/megacell.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/megacell.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/metalbox.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/metalbox.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/metalbox.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/metalbox.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/mosaic.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/mosaic.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/mosaic.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/mosaic.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/old_vents.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/old_vents.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/old_vents.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/old_vents.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/pgcircuit.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/pgcircuit.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/pgcircuit.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/pgcircuit.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/piping.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/piping.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/piping.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/piping.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/pwireframe.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/pwireframe.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/pwireframe.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/pwireframe.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/rgrate.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/rgrate.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/rgrate.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/rgrate.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/rust.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/rust.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/rust.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/rust.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/rust_bplates.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/rust_bplates.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/rust_bplates.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/rust_bplates.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/rust_plates.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/rust_plates.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/rust_plates.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/rust_plates.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/rusty_scaffold.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/rusty_scaffold.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/rusty_scaffold.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/rusty_scaffold.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/scaffold.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/scaffold.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/scaffold.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/scaffold.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/small_pipes.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/small_pipes.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/small_pipes.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/small_pipes.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/srust.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/srust.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/srust.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/srust.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/sturdy.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/sturdy.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/sturdy.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/sturdy.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/vent.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/vent.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/vent.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/vent.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/vrust.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/vrust.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/vrust.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/vrust.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/wgpanel.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/wgpanel.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/wgpanel.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/wgpanel.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/wireframe.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/wireframe.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/wireframe.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/wireframe.json diff --git a/common/src/main/resources/data/factory_blocks/loot_tables/blocks/wopanel.json b/common/src/main/resources/data/factory_blocks/loot_table/blocks/wopanel.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/loot_tables/blocks/wopanel.json rename to common/src/main/resources/data/factory_blocks/loot_table/blocks/wopanel.json diff --git a/common/src/main/resources/data/factory_blocks/tags/blocks/factory.json b/common/src/main/resources/data/factory_blocks/tags/block/factory.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/tags/blocks/factory.json rename to common/src/main/resources/data/factory_blocks/tags/block/factory.json diff --git a/common/src/main/resources/data/factory_blocks/tags/items/factory.json b/common/src/main/resources/data/factory_blocks/tags/item/factory.json similarity index 100% rename from common/src/main/resources/data/factory_blocks/tags/items/factory.json rename to common/src/main/resources/data/factory_blocks/tags/item/factory.json diff --git a/common/src/main/resources/data/minecraft/tags/blocks/dragon_immune.json b/common/src/main/resources/data/minecraft/tags/block/dragon_immune.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/blocks/dragon_immune.json rename to common/src/main/resources/data/minecraft/tags/block/dragon_immune.json diff --git a/common/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/common/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json rename to common/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json diff --git a/common/src/main/resources/data/minecraft/tags/blocks/wither_immune.json b/common/src/main/resources/data/minecraft/tags/block/wither_immune.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/blocks/wither_immune.json rename to common/src/main/resources/data/minecraft/tags/block/wither_immune.json diff --git a/gradle.properties b/gradle.properties index 575d72c..b5bd245 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx2048M minecraft_version=1.21.1 enabled_platforms=fabric,neoforge -mod_version=1.3.3 +mod_version=1.3.4 maven_group=com.slaincow.factoryblocks archives_base_name=factory_blocks