diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_shaft.png b/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_shaft.png index 0c12c0971..a27781398 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_shaft.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_shaft.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_shaft_top.png b/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_shaft_top.png index 62235518a..d4320f4f0 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_shaft_top.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_shaft_top.png differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/back_details/a_fin.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/back_details/a_fin.nbt new file mode 100644 index 000000000..34198f1b7 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/back_details/a_fin.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/back_details/back_shield.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/back_details/back_shield.nbt new file mode 100644 index 000000000..c24a79775 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/back_details/back_shield.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/back_details/l_fin.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/back_details/l_fin.nbt new file mode 100644 index 000000000..b5be18832 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/back_details/l_fin.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/back_details/ramjet_engines.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/back_details/ramjet_engines.nbt new file mode 100644 index 000000000..6b82e4218 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/back_details/ramjet_engines.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/back_details/ventilation_center.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/back_details/ventilation_center.nbt new file mode 100644 index 000000000..2f4cdda07 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/back_details/ventilation_center.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/bows/bow_a.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/bows/bow_a.nbt new file mode 100644 index 000000000..a0c43b36f Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/bows/bow_a.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/bows/bow_hammer.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/bows/bow_hammer.nbt new file mode 100644 index 000000000..f436a01da Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/bows/bow_hammer.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/bows/bow_l.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/bows/bow_l.nbt new file mode 100644 index 000000000..82376e203 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/bows/bow_l.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/cargo/frigate_cargo_gold.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/cargo/frigate_cargo_gold.nbt new file mode 100644 index 000000000..12872dd5f Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/cargo/frigate_cargo_gold.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/cargo/frigate_cargo_iron.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/cargo/frigate_cargo_iron.nbt new file mode 100644 index 000000000..8f736214b Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/cargo/frigate_cargo_iron.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/cargo/frigate_cargo_lava.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/cargo/frigate_cargo_lava.nbt new file mode 100644 index 000000000..d1e0509d1 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/cargo/frigate_cargo_lava.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/cargo/frigate_cargo_scrap.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/cargo/frigate_cargo_scrap.nbt new file mode 100644 index 000000000..ea9ee818d Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/cargo/frigate_cargo_scrap.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/cargo/frigate_cargo_tritanium.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/cargo/frigate_cargo_tritanium.nbt new file mode 100644 index 000000000..2dc3a75b1 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/cargo/frigate_cargo_tritanium.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/frigate_back.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/frigate_back.nbt new file mode 100644 index 000000000..45128b479 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/frigate_back.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/frigate_front.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/frigate_front.nbt new file mode 100644 index 000000000..d507eb6f9 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/frigate_front.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_a.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_a.nbt new file mode 100644 index 000000000..b5ec2b9e2 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_a.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_b.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_b.nbt new file mode 100644 index 000000000..83985bda2 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_b.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_c.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_c.nbt new file mode 100644 index 000000000..48c9b5ade Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_c.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_d.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_d.nbt new file mode 100644 index 000000000..b8871754e Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/frigate/rooms/frigate_room_d.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/back/frigate_back_a.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate_legacy/back/frigate_back_a.nbt similarity index 100% rename from src/main/resources/data/overdrive_that_matters/structure/frigate/back/frigate_back_a.nbt rename to src/main/resources/data/overdrive_that_matters/structure/frigate_legacy/back/frigate_back_a.nbt diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/front/frigate_front_a.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate_legacy/front/frigate_front_a.nbt similarity index 100% rename from src/main/resources/data/overdrive_that_matters/structure/frigate/front/frigate_front_a.nbt rename to src/main/resources/data/overdrive_that_matters/structure/frigate_legacy/front/frigate_front_a.nbt diff --git a/src/main/resources/data/overdrive_that_matters/structure/frigate/front/frigate_front_b.nbt b/src/main/resources/data/overdrive_that_matters/structure/frigate_legacy/front/frigate_front_b.nbt similarity index 100% rename from src/main/resources/data/overdrive_that_matters/structure/frigate/front/frigate_front_b.nbt rename to src/main/resources/data/overdrive_that_matters/structure/frigate_legacy/front/frigate_front_b.nbt diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/structure/frigate.json b/src/main/resources/data/overdrive_that_matters/worldgen/structure/frigate.json index f02af2e14..942ed8d54 100644 --- a/src/main/resources/data/overdrive_that_matters/worldgen/structure/frigate.json +++ b/src/main/resources/data/overdrive_that_matters/worldgen/structure/frigate.json @@ -2,11 +2,11 @@ "type": "minecraft:jigsaw", "biomes": "#overdrive_that_matters:frigate", "max_distance_from_center": 100, - "size": 1, + "size": 8, "start_height": { "type": "minecraft:uniform", "max_inclusive": { - "below_top": 30 + "below_top": 40 }, "min_inclusive": { "absolute": 100 diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/back_details.json b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/back_details.json new file mode 100644 index 000000000..f1a0be084 --- /dev/null +++ b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/back_details.json @@ -0,0 +1,57 @@ +{ + "name": "overdrive_that_matters:back_details", + "fallback": "minecraft:empty", + "elements": [ + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:frigate/back_details/a_fin", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 1 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:frigate/back_details/l_fin", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 1 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:frigate/back_details/back_shield", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 1 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:frigate/back_details/ramjet_engines", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 1 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:frigate/back_details/ventilation_center", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 1 + }, + { + "element": { + "element_type": "minecraft:empty_pool_element" + }, + "weight": 1 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/bows.json b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/bows.json new file mode 100644 index 000000000..a9115f219 --- /dev/null +++ b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/bows.json @@ -0,0 +1,39 @@ +{ + "name": "overdrive_that_matters:bows", + "fallback": "minecraft:empty", + "elements": [ + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:frigate/bows/bow_a", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 1 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:frigate/bows/bow_l", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 1 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:frigate/bows/bow_hammer", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 1 + }, + { + "element": { + "element_type": "minecraft:empty_pool_element" + }, + "weight": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/cargo.json b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/cargo.json new file mode 100644 index 000000000..53c18cd1f --- /dev/null +++ b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/cargo.json @@ -0,0 +1,57 @@ +{ + "name": "overdrive_that_matters:back_details", + "fallback": "minecraft:empty", + "elements": [ + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:frigate/cargo/frigate_cargo_iron", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 2 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:frigate/cargo/frigate_cargo_gold", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 1 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:frigate/cargo/frigate_cargo_lava", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 1 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:frigate/cargo/frigate_cargo_scrap", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 2 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:frigate/cargo/frigate_cargo_tritanium", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 1 + }, + { + "element": { + "element_type": "minecraft:empty_pool_element" + }, + "weight": 3 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/frigate_back.json b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/frigate_back.json index c17af4e3a..8fc7bfd68 100644 --- a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/frigate_back.json +++ b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/frigate_back.json @@ -5,7 +5,7 @@ { "element": { "element_type": "minecraft:single_pool_element", - "location": "overdrive_that_matters:frigate/back/frigate_back_a", + "location": "overdrive_that_matters:frigate/frigate_back", "processors": "minecraft:empty", "projection": "rigid" }, diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/frigate_front.json b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/frigate_front.json index dc77ce522..eda33233f 100644 --- a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/frigate_front.json +++ b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/frigate_front.json @@ -2,19 +2,10 @@ "name": "overdrive_that_matters:frigate_front", "fallback": "minecraft:empty", "elements": [ - { - "element": { - "element_type": "minecraft:single_pool_element", - "location": "overdrive_that_matters:frigate/front/frigate_front_a", - "processors": "minecraft:empty", - "projection": "rigid" - }, - "weight": 1 - }, { "element": { "element_type": "minecraft:single_pool_element", - "location": "overdrive_that_matters:frigate/front/frigate_front_b", + "location": "overdrive_that_matters:frigate/frigate_front", "processors": "minecraft:empty", "projection": "rigid" }, diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/rooms.json b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/rooms.json new file mode 100644 index 000000000..6e6d1f518 --- /dev/null +++ b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/frigate/rooms.json @@ -0,0 +1,42 @@ +{ + "name": "overdrive_that_matters:back_details", + "fallback": "minecraft:empty", + "elements": [ + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:frigate/rooms/frigate_room_a", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 1 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:frigate/rooms/frigate_room_b", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 1 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:frigate/rooms/frigate_room_c", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 1 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:frigate/rooms/frigate_room_d", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 1 + } + ] +} \ No newline at end of file