From f30e7077317447d98261299df6671350c675bc29 Mon Sep 17 00:00:00 2001
From: Lukas Klingsbo <me@lukas.fyi>
Date: Fri, 20 May 2022 22:16:20 +0200
Subject: [PATCH] fix: Add restitution to Ball

---
 packages/pinball_components/lib/pinball_components.dart   | 3 ++-
 .../pinball_components/lib/src/components/ball/ball.dart  | 8 +++++++-
 .../lib/src/components/multiball/multiball.dart           | 4 ++--
 .../pinball_components/lib/src/pinball_components.dart    | 2 --
 .../components/multiball/cubit/multiball_state_test.dart  | 2 +-
 .../multiplier/cubit/multiplier_state_test.dart           | 2 +-
 6 files changed, 13 insertions(+), 8 deletions(-)
 delete mode 100644 packages/pinball_components/lib/src/pinball_components.dart

diff --git a/packages/pinball_components/lib/pinball_components.dart b/packages/pinball_components/lib/pinball_components.dart
index cf394b0e..4a30e303 100644
--- a/packages/pinball_components/lib/pinball_components.dart
+++ b/packages/pinball_components/lib/pinball_components.dart
@@ -1,4 +1,5 @@
 library pinball_components;
 
 export 'gen/gen.dart';
-export 'src/pinball_components.dart';
+export 'src/components/components.dart';
+export 'src/extensions/extensions.dart';
diff --git a/packages/pinball_components/lib/src/components/ball/ball.dart b/packages/pinball_components/lib/src/components/ball/ball.dart
index e9c0e628..22db0741 100644
--- a/packages/pinball_components/lib/src/components/ball/ball.dart
+++ b/packages/pinball_components/lib/src/components/ball/ball.dart
@@ -66,7 +66,13 @@ class Ball extends BodyComponent with Layered, InitialPosition, ZIndex {
       bullet: true,
     );
 
-    return world.createBody(bodyDef)..createFixtureFromShape(shape, 1);
+    final fixtureDef = FixtureDef(
+      shape,
+      restitution: 0.35,
+      density: 1,
+    );
+
+    return world.createBody(bodyDef)..createFixture(fixtureDef);
   }
 
   /// Immediately and completely [stop]s the ball.
diff --git a/packages/pinball_components/lib/src/components/multiball/multiball.dart b/packages/pinball_components/lib/src/components/multiball/multiball.dart
index 38150aea..a433189a 100644
--- a/packages/pinball_components/lib/src/components/multiball/multiball.dart
+++ b/packages/pinball_components/lib/src/components/multiball/multiball.dart
@@ -1,9 +1,9 @@
 import 'dart:math' as math;
+
 import 'package:flame/components.dart';
 import 'package:flutter/material.dart';
-import 'package:pinball_components/gen/assets.gen.dart';
+import 'package:pinball_components/pinball_components.dart';
 import 'package:pinball_components/src/components/multiball/behaviors/behaviors.dart';
-import 'package:pinball_components/src/pinball_components.dart';
 import 'package:pinball_flame/pinball_flame.dart';
 
 export 'cubit/multiball_cubit.dart';
diff --git a/packages/pinball_components/lib/src/pinball_components.dart b/packages/pinball_components/lib/src/pinball_components.dart
deleted file mode 100644
index e50f9875..00000000
--- a/packages/pinball_components/lib/src/pinball_components.dart
+++ /dev/null
@@ -1,2 +0,0 @@
-export 'components/components.dart';
-export 'extensions/extensions.dart';
diff --git a/packages/pinball_components/test/src/components/multiball/cubit/multiball_state_test.dart b/packages/pinball_components/test/src/components/multiball/cubit/multiball_state_test.dart
index 69789be9..5f5f5f8d 100644
--- a/packages/pinball_components/test/src/components/multiball/cubit/multiball_state_test.dart
+++ b/packages/pinball_components/test/src/components/multiball/cubit/multiball_state_test.dart
@@ -1,7 +1,7 @@
 // ignore_for_file: prefer_const_constructors
 
 import 'package:flutter_test/flutter_test.dart';
-import 'package:pinball_components/src/pinball_components.dart';
+import 'package:pinball_components/pinball_components.dart';
 
 void main() {
   group('MultiballState', () {
diff --git a/packages/pinball_components/test/src/components/multiplier/cubit/multiplier_state_test.dart b/packages/pinball_components/test/src/components/multiplier/cubit/multiplier_state_test.dart
index 9789d7c5..67bc26b7 100644
--- a/packages/pinball_components/test/src/components/multiplier/cubit/multiplier_state_test.dart
+++ b/packages/pinball_components/test/src/components/multiplier/cubit/multiplier_state_test.dart
@@ -1,7 +1,7 @@
 // ignore_for_file: prefer_const_constructors
 
 import 'package:flutter_test/flutter_test.dart';
-import 'package:pinball_components/src/pinball_components.dart';
+import 'package:pinball_components/pinball_components.dart';
 
 void main() {
   group('MultiplierState', () {