diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/GravitationStabilizerRenderer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/GravitationStabilizerRenderer.kt index 79dd06175..56ea13bcc 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/GravitationStabilizerRenderer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/GravitationStabilizerRenderer.kt @@ -157,16 +157,23 @@ class GravitationStabilizerRenderer(private val context: BlockEntityRendererProv override fun getViewDistance() = 96 companion object { - private val OUTER_COLOR_A = RGBAColor(0, 36, 255, 110) - private val OUTER_COLOR_B = RGBAColor(32, 179, 255, 110) + private val OUTER_COLOR_A = RGBAColor(37, 255, 129, 110) + private val OUTER_COLOR_B = RGBAColor(37, 255, 129, 110) private val OUTER_COLOR_C = RGBAColor(37, 255, 129, 110) - private val OUTER_COLOR_D = RGBAColor(218, 137, 255, 110) + private val OUTER_COLOR_D = RGBAColor(37, 255, 129, 110) - private val INNER_COLOR_A = RGBAColor(127, 114, 0) - private val INNER_COLOR_B = RGBAColor(174, 115, 0) + private val INNER_COLOR_A = RGBAColor(69, 240, 255) + private val INNER_COLOR_B = RGBAColor(69, 240, 255) private val INNER_COLOR_C = RGBAColor(69, 240, 255) private val INNER_COLOR_D = RGBAColor.WHITE + //(0, 36, 255, 110) + //(32, 179, 255, 110) + + //(174, 115, 0) + //(69, 240, 255) + //(69, 240, 255) + private const val RAY_RADIUS_INNER = 0.18 private const val RAY_RADIUS_OUTER = 0.22 private const val k = 2.414213562373095 // 1.0 + sqrt(2.0) diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer.png b/src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer.png index dfc827e85..c4b43aff5 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer_em.png index 5d12bc072..336799c4d 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer_em.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer_em.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer_idle.png b/src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer_idle.png index 14c3ec6e9..618c3c345 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer_idle.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer_idle.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer_idle_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer_idle_em.png index 1a347454f..7f7c95c4a 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer_idle_em.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer_idle_em.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler.png index 563f9021d..e440f0e48 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler_em.png index 5d8b6025d..ab1db4e56 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler_em.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler_em.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer.png index cf8080728..4a4fcc0db 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer_em.png index 8de3c5bf7..8ad97db8e 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer_em.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer_em.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler.png index 69d034775..1a6e548f4 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler_em.png index 2e1f40455..6b48c2cb8 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler_em.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler_em.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator.png index d04b54184..77c5ed578 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_em.png index bea467f8e..09c99d763 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_em.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_em.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted.png index 228d97add..dd7d1376e 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted_em.png index 6eff67585..a83f9bd04 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted_em.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted_em.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline.png index 80819b285..2ec13fc1e 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline_em.png index 552f9ae48..2b21edc16 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline_em.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline_em.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame.png b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame.png index 6f210a897..28b5f23ca 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matterybank_core.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matterybank_core.png index 00be3cc55..98e4f6e54 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/matterybank_core.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/matterybank_core.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matterybank_core_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matterybank_core_em.png index b19a1eb4a..9e65bdf49 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/matterybank_core_em.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/matterybank_core_em.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets.png index 78b52f14e..1574d5f01 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets.png and b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/electromagnet.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/electromagnet.png index d36635b4d..1efaf18bf 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/component/electromagnet.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/component/electromagnet.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/gold_plate.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/gold_plate.png index d36635b4d..4e23ad46a 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/component/gold_plate.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/component/gold_plate.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/gravitation_field_limiter.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/gravitation_field_limiter.png index df4b825a4..123b4d1e2 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/component/gravitation_field_limiter.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/component/gravitation_field_limiter.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/iron_plate.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/iron_plate.png index 76a4610ef..d7f88f056 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/component/iron_plate.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/component/iron_plate.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/matter_capacitor_parts.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/matter_capacitor_parts.png index 3a9c59816..de0bc920f 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/component/matter_capacitor_parts.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/component/matter_capacitor_parts.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/matter_io_port.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/matter_io_port.png index 1b33026bf..48b538b1a 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/component/matter_io_port.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/component/matter_io_port.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/matter_transform_matrix.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/matter_transform_matrix.png index 05208e6a7..36416c9eb 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/component/matter_transform_matrix.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/component/matter_transform_matrix.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/quantum_transceiver.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/quantum_transceiver.png index d36635b4d..4f7134e34 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/component/quantum_transceiver.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/component/quantum_transceiver.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/tritanium_plate.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/tritanium_plate.png index 5004ebb4a..0ff46059f 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/component/tritanium_plate.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/component/tritanium_plate.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_creative.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_creative.png index c823d753c..169c44e16 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_creative.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_creative.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier0.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier0.png index fbe8e4613..bcbe51ab4 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier0.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier0.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier1.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier1.png index bdf4bf757..895bfacb5 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier1.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier1.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier2.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier2.png index 53e2e2c82..c597022bc 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier2.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier2.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier3.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier3.png index 063eed92b..6c01eb10c 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier3.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier3.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier4.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier4.png index a5bc3cc06..112e24523 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier4.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_tier4.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_creative.png b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_creative.png index 3f95107fe..1d70c6409 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_creative.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_creative.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_creative2.png b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_creative2.png new file mode 100644 index 000000000..4772d00d0 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_creative2.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier0.png b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier0.png index 300d77ad6..d04d86a57 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier0.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier0.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier0_em.png b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier0_em.png deleted file mode 100644 index d1b502e79..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier0_em.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier1.png b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier1.png index 3a2c184d0..a21794cb4 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier1.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier1.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier2.png b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier2.png index 5c1b0853b..3d76f653d 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier2.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier2.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier2_em.png b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier2_em.png deleted file mode 100644 index d1b502e79..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier2_em.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier3.png b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier3.png index 424983607..787485f42 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier3.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier3.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier4.png b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier4.png index c07e4fd86..3bba36e8d 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier4.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/pattern_drive_tier4.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/tritanium_helmet.png b/src/main/resources/assets/overdrive_that_matters/textures/item/tritanium_helmet.png index 1599737d7..478c3de18 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/tritanium_helmet.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/tritanium_helmet.png differ