Revert "Unfinished labs"

This reverts commit 2d87301ecb.

src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesChests.kt

@@ -44,26 +44,6 @@ fun addChestLootTables(loot: LootTables) {
 		}
 	}
 
-	loot.builder(LootContextParamSets.VAULT, modLootTable("laboratory_vault")){
-		lootPool {
-			item(MItems.MATTER_DUST) {
-				chanceCondition(0.1)
-				setWeight(4)
-				apply(MatterDustItem.Randomizer(UniformDecimal(Decimal(100), Decimal(2_500))))
-			}
-			item(Items.IRON_INGOT) {
-				setCount(minimal = 1, maximal = 3)
-				setWeight(3)
-			}
-
-		}
-	}
-
-	loot.builder(LootContextParamSets.VAULT, modLootTable("laboratory_ominous_vault")){
-
-
-	}
-
 	loot.builder(LootContextParamSets.CHEST, modLootTable("frigate_cargo")) {
 		lootPool {
 			item(Items.IRON_INGOT) {

src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleBlockEntity.kt

@@ -5,8 +5,6 @@ import net.minecraft.client.Minecraft
 import net.minecraft.core.BlockPos
 import net.minecraft.core.HolderLookup
 import net.minecraft.core.SectionPos
-import net.minecraft.core.particles.DustParticleOptions
-import net.minecraft.core.particles.ParticleTypes
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.server.level.ServerLevel
 import net.minecraft.server.level.ServerPlayer
@@ -213,31 +211,6 @@ class BlackHoleBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) : Mattery
 			val distance = item.position().distanceTo(center)
 			setDeltaMovement(item, center, distance)
 		}
-
-		//no way null malware reference
-		val tempLevel = level
-		if (tempLevel?.otmRandom!!.nextFloat() < 0.8f) {
-
-			val size = gravitationStrength.pow(0.5)
-			val eventHorizonRadius = size / 2
-
-			val spawnRadius = 4 + eventHorizonRadius * (1.2 + tempLevel.otmRandom.nextDouble() * 0.6)
-
-			val theta = tempLevel.otmRandom.nextDouble() * Math.PI * 2
-			val phi = tempLevel.otmRandom.nextDouble() * Math.PI - Math.PI / 2
-
-			//мугек я не ощущаю центр
-			//хз нужно настроить
-			val x = blockPos.x + 0.5 + spawnRadius * Math.cos(theta) * Math.cos(phi)
-			val y = blockPos.y + 0.5 + spawnRadius * Math.sin(phi)
-			val z = blockPos.z + 0.5 + spawnRadius * Math.sin(theta) * Math.cos(phi)
-
-			val motionX = (blockPos.x + 0.5 - x) * 0.05
-			val motionY = (blockPos.y - 1.5 - y) * 0.05
-			val motionZ = (blockPos.z + 0.5 - z) * 0.05
-
-			tempLevel.addParticle(ParticleTypes.SMOKE, x, y, z, motionX, motionY, motionZ)
-		}
 	}
 
 	private val sphericalPositionsCache = ArrayList<BlockPos>()

src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt

@@ -331,8 +331,8 @@ object MNames {
 	const val LOADER = "loader"
 
 	const val ANDROID_MELEE = "android_melee"
-	const val ANDROID_RANGED = "android_ranged"
+	const val ANDROID_RANGED = "android_melee"
-	const val ANDROID_OVERSEER = "android_overseer"
+	const val ANDROID_OVERSEER = "android_melee"
 
 	const val PHANTOM_ATTRACTOR = "phantom_attractor"
 	const val JUMP_BOOST = "jump_boost"

src/main/resources/data/overdrive_that_matters/tags/worldgen/biome/laboratory.json

@@ -2,7 +2,6 @@
   "replace": false,
   "values": [
 	"#c:is_desert",
-	"minecraft:plains",
+	"minecraft:plains"
-	"minecraft:taiga"
   ]
 }

src/main/resources/data/overdrive_that_matters/worldgen/processor_list/laboratory_weathering.json

@@ -1,61 +0,0 @@
-{
-  "processors": [
-    {
-      "processor_type": "minecraft:rule",
-      "rules": [
-        {
-          "input_predicate": {
-            "block": "overdrive_that_matters:tritanium_block_light_gray",
-            "predicate_type": "minecraft:random_block_match",
-            "probability": 0.2
-          },
-          "location_predicate": {
-            "predicate_type": "minecraft:always_true"
-          },
-          "output_state": {
-            "Name": "overdrive_that_matters:decorative_crate"
-          }
-        },
-        {
-          "input_predicate": {
-            "block": "overdrive_that_matters:metal_mesh",
-            "predicate_type": "minecraft:random_block_match",
-            "probability": 0.1
-          },
-          "location_predicate": {
-            "predicate_type": "minecraft:always_true"
-          },
-          "output_state": {
-            "Name": "minecraft:air"
-          }
-        },
-		{
-          "input_predicate": {
-            "block": "overdrive_that_matters:floor_tiles_stairs_white",
-            "predicate_type": "minecraft:random_block_match",
-            "probability": 0.1
-          },
-          "location_predicate": {
-            "predicate_type": "minecraft:always_true"
-          },
-          "output_state": {
-            "Name": "overdrive_that_matters:floor_tiles_slab_white"
-          }
-        },
-		{
-          "input_predicate": {
-            "block": "overdrive_that_matters:reinforced_redstone_lamp_inverted",
-            "predicate_type": "minecraft:random_block_match",
-            "probability": 0.3
-          },
-          "location_predicate": {
-            "predicate_type": "minecraft:always_true"
-          },
-          "output_state": {
-            "Name": "overdrive_that_matters:reinforced_redstone_lamp"
-          }
-        }
-      ]
-    }
-  ]
-}

src/main/resources/data/overdrive_that_matters/worldgen/structure/laboratory.json

@@ -1,24 +1,18 @@
 {
   "type": "minecraft:jigsaw",
   "biomes": "#overdrive_that_matters:laboratory",
-  "max_distance_from_center": 112,
+  "max_distance_from_center": 100,
   "liquid_settings": "ignore_waterlogging",
-  "size": 10,
+  "size": 7,
   "start_height": {
-    "type": "minecraft:uniform",
+    "absolute": -13
-    "max_inclusive": {
-      "absolute": 30
-    },
-    "min_inclusive": {
-      "absolute": -13
-    }
   },
   "spawn_overrides": {
     "monster": {
       "bounding_box": "piece",
       "spawns": [
         {
-          "type": "overdrive_that_matters:android_melee",
+          "type": "minecraft:pillager",
           "weight": 1,
           "minCount": 1,
           "maxCount": 2
@@ -27,7 +21,7 @@
     }
   },
   "start_jigsaw_name": "overdrive_that_matters:laboratory_anchor",
-  "start_pool": "overdrive_that_matters:laboratory/entrance",
+  "start_pool": "overdrive_that_matters:laboratory/center",
   "step": "underground_decoration",
   "terrain_adaption": "encapsulate",
   "use_expansion_hack": false

src/main/resources/data/overdrive_that_matters/worldgen/structure_set/laboratory.json

@@ -3,7 +3,7 @@
     "type": "minecraft:random_spread",
     "salt": 20803232,
     "separation": 8,
-    "spacing": 12
+    "spacing": 24
   },
   "structures": [
     {

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/center.json

@@ -0,0 +1,24 @@
+{
+  "name": "overdrive_that_matters:center",
+  "elements": [
+	 {
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:laboratory/center/lab_arena_0",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 1
+	 },
+	  {
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:laboratory/center/lab_arena_1",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 1
+	 }
+  ],
+  "fallback": "minecraft:empty"
+}

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/crossroads.json

@@ -1,15 +0,0 @@
-{
-  "name": "overdrive_that_matters:crossroads",
-  "elements": [
-	 {
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/crossroads/vertical_a",
-        "processors": "overdrive_that_matters:laboratory_weathering",
-		"projection": "rigid"
-      },
-	  "weight": 1
-	 }
-  ],
-  "fallback": "overdrive_that_matters:laboratory/fallback_pool"
-}

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/entrance.json

@@ -1,15 +0,0 @@
-{
-  "name": "overdrive_that_matters:entrance",
-  "elements": [
-	 {
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/entrance/entrance_a",
-        "processors": "overdrive_that_matters:laboratory_weathering",
-		"projection": "rigid"
-      },
-	  "weight": 1
-	 }
-  ],
-  "fallback": "minecraft:empty"
-}

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/fallback_pool.json

@@ -4,16 +4,7 @@
 	{
       "element": {
 		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/hall_fallback",
+		"location": "overdrive_that_matters:laboratory/dead_end",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-	},
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/hall_fallback_core",
         "processors": "minecraft:empty",
 		"projection": "rigid"
       },

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/fluff.json

@@ -1,51 +0,0 @@
-{
-  "name": "overdrive_that_matters:fluff",
-  "elements": [
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/fluff/chair",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/fluff/office",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/fluff/refinery",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/fluff/server",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/fluff/storage",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-    }
-  ],
-  "fallback": "minecraft:empty"
-}

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/halls/bridges.json

@@ -1,48 +0,0 @@
-{
-  "name": "overdrive_that_matters:bridges",
-  "elements": [
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/halls/bridges/bridge",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 3
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/halls/bridges/bridge_broken",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 3
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/halls/bridges/bridge_repair",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 3
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/halls/bridges/bridge_wood",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 2
-    },
-	{
-      "element": {
-		"element_type": "minecraft:empty_pool_element"
-      },
-	  "weight": 1
-    }
-  ],
-  "fallback": "minecraft:empty"
-}

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/halls/center.json

@@ -1,15 +0,0 @@
-{
-  "name": "overdrive_that_matters:center",
-  "elements": [
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/halls/center/center_a",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-    }
-  ],
-  "fallback": "minecraft:empty"
-}

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/halls/decor.json

@@ -1,33 +0,0 @@
-{
-  "name": "overdrive_that_matters:bridges",
-  "elements": [
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/halls/decor/camp_a",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/halls/decor/junk_array",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/halls/decor/stockpile",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-    }
-  ],
-  "fallback": "minecraft:empty"
-}

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/halls/hall1.json

@@ -1,15 +0,0 @@
-{
-  "name": "overdrive_that_matters:hall1",
-  "elements": [
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/halls/hall1/hall_overgrown",
-        "processors": "overdrive_that_matters:laboratory_weathering",
-		"projection": "rigid"
-      },
-	  "weight": 1
-    }
-  ],
-  "fallback": "overdrive_that_matters:laboratory/fallback_pool"
-}

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/halls/hall2.json

@@ -1,15 +0,0 @@
-{
-  "name": "overdrive_that_matters:hall2",
-  "elements": [
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/halls/hall1/hall_overgrown",
-        "processors": "overdrive_that_matters:laboratory_weathering",
-		"projection": "rigid"
-      },
-	  "weight": 4
-    }
-  ],
-  "fallback": "overdrive_that_matters:laboratory/fallback_pool"
-}

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/intersections.json

@@ -1,42 +0,0 @@
-{
-  "name": "overdrive_that_matters:intersections",
-  "elements": [
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/intersections/stairs_a",
-        "processors": "overdrive_that_matters:laboratory_weathering",
-		"projection": "rigid"
-      },
-	  "weight": 3
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/intersections/stairs_b",
-        "processors": "overdrive_that_matters:laboratory_weathering",
-		"projection": "rigid"
-      },
-	  "weight": 3
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/intersections/turn_a",
-        "processors": "overdrive_that_matters:laboratory_weathering",
-		"projection": "rigid"
-      },
-	  "weight": 1
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/intersections/lava",
-        "processors": "overdrive_that_matters:laboratory_weathering",
-		"projection": "rigid"
-      },
-	  "weight": 1
-    }
-  ],
-  "fallback": "overdrive_that_matters:laboratory/fallback_pool"
-}

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/main.json

@@ -0,0 +1,78 @@
+{
+  "name": "overdrive_that_matters:main",
+  "elements": [
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:laboratory/main/corridor_0",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 4
+    },
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:laboratory/main/corridor_1",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 4
+    },
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:laboratory/main/corridor_turn_0",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 4
+    },
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:laboratory/main/corrior_t_0",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 3
+    },
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:laboratory/main/corridor_room_0",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 3
+    },
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:laboratory/main/corridor_stairs_0",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 2
+    },
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:laboratory/main/generator_room_0",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 2
+    },
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:laboratory/main/portal_room_0",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 1
+    }
+  ],
+  "fallback": "overdrive_that_matters:laboratory/fallback_pool"
+}

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/reward/reward.json

@@ -1,15 +0,0 @@
-{
-  "name": "overdrive_that_matters:reward",
-  "elements": [
-	 {
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/reward/reward",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-	 }
-  ],
-  "fallback": "minecraft:empty"
-}

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/reward/reward_ominous_wall.json

@@ -1,15 +0,0 @@
-{
-  "name": "overdrive_that_matters:reward_ominous_wall",
-  "elements": [
-	 {
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/reward/reward_ominous_wall",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-	 }
-  ],
-  "fallback": "minecraft:empty"
-}

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/reward/reward_wall.json

@@ -1,15 +0,0 @@
-{
-  "name": "overdrive_that_matters:reward_wall",
-  "elements": [
-	 {
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/reward/reward_wall",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-	 }
-  ],
-  "fallback": "minecraft:empty"
-}

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/rooms.json

@@ -1,24 +0,0 @@
-{
-  "name": "overdrive_that_matters:rooms",
-  "elements": [
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/rooms/office_a",
-        "processors": "overdrive_that_matters:laboratory_weathering",
-		"projection": "rigid"
-      },
-	  "weight": 1
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/rooms/office_b",
-        "processors": "overdrive_that_matters:laboratory_weathering",
-		"projection": "rigid"
-      },
-	  "weight": 1
-    }
-  ],
-  "fallback": "overdrive_that_matters:laboratory/fallback_pool"
-}

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/spawner/s_heavy.json

@@ -1,15 +0,0 @@
-{
-  "name": "overdrive_that_matters:s_heavy",
-  "elements": [
-	 {
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/spawner/s_loader",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-	 }
-  ],
-  "fallback": "minecraft:empty"
-}

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/spawner/s_melee.json

@@ -1,15 +0,0 @@
-{
-  "name": "overdrive_that_matters:s_heavy",
-  "elements": [
-	 {
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/spawner/s_android_melee",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-	 }
-  ],
-  "fallback": "minecraft:empty"
-}