Merge pull request #111 from obiwac/ruff-as-a-formatter

Ruff as a formatter
obiwac · Jul 30, 2024 · 4a48e3a · 4a48e3a
2 parents d0d4979 + c37cbe0
commit 4a48e3a
Show file tree

Hide file tree

Showing 30 changed files with 783 additions and 202 deletions.
diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml
@@ -7,23 +7,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: chartboost/ruff-action@v1
         with:
-          python-version: "3.11"
-      - name: Create and activate venv
-        run: |
-          python -m venv .venv
-          source .venv/bin/activate
-      - name: Install dependencies
-        run: pip install tan ruff
-      - name: Cache venv
-        uses: actions/cache@v3
-        with:
-          path: ./.venv
-          key: venv-${{ runner.os }}
-      - name: Run formatter
-        run: |
-          tan --check . --use-tabs --line-length 120 --verbose
-      - name: Run linter
-        run: |
-          ruff check . --ignore E402 --ignore F405 --ignore F403
+          args: 'format --check'
+
+  check_linting:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: chartboost/ruff-action@v1
diff --git a/community/options.py b/community/options.py
@@ -31,9 +31,7 @@
 # Recommended values are between 0 and 9
 
 # Legacy Smooth FPS
-SMOOTH_FPS = (
-	False  # Legacy way to force the flushing of command buffer and forces the CPU to wait for the GPU to finish rendering.
-)
+SMOOTH_FPS = False  # Legacy way to force the flushing of command buffer and forces the CPU to wait for the GPU to finish rendering.
 # Incompatible Max CPU Ahead Frames (it won't be effective)
 # Enable this to test whether its impact is better. Similar to Max CPU Ahead frames to 0
 

diff --git a/community/save.py b/community/save.py
@@ -68,11 +68,9 @@ def save_chunk(self, chunk_position):
 		for x in range(chunk.CHUNK_WIDTH):
 			for y in range(chunk.CHUNK_HEIGHT):
 				for z in range(chunk.CHUNK_LENGTH):
-					chunk_blocks[
-						x * chunk.CHUNK_LENGTH * chunk.CHUNK_HEIGHT + z * chunk.CHUNK_HEIGHT + y
-					] = self.world.chunks[
-						chunk_position
-					].blocks[x][y][z]
+					chunk_blocks[x * chunk.CHUNK_LENGTH * chunk.CHUNK_HEIGHT + z * chunk.CHUNK_HEIGHT + y] = (
+						self.world.chunks[chunk_position].blocks[x][y][z]
+					)
 
 		# save the chunk file
 

diff --git a/episode-11/save.py b/episode-11/save.py
@@ -64,11 +64,9 @@ def save_chunk(self, chunk_position):
 		for x in range(chunk.CHUNK_WIDTH):
 			for y in range(chunk.CHUNK_HEIGHT):
 				for z in range(chunk.CHUNK_LENGTH):
-					chunk_blocks[
-						x * chunk.CHUNK_LENGTH * chunk.CHUNK_HEIGHT + z * chunk.CHUNK_HEIGHT + y
-					] = self.world.chunks[
-						chunk_position
-					].blocks[x][y][z]
+					chunk_blocks[x * chunk.CHUNK_LENGTH * chunk.CHUNK_HEIGHT + z * chunk.CHUNK_HEIGHT + y] = (
+						self.world.chunks[chunk_position].blocks[x][y][z]
+					)
 
 		# save the chunk file
 

diff --git a/episode-12/save.py b/episode-12/save.py
@@ -64,11 +64,9 @@ def save_chunk(self, chunk_position):
 		for x in range(chunk.CHUNK_WIDTH):
 			for y in range(chunk.CHUNK_HEIGHT):
 				for z in range(chunk.CHUNK_LENGTH):
-					chunk_blocks[
-						x * chunk.CHUNK_LENGTH * chunk.CHUNK_HEIGHT + z * chunk.CHUNK_HEIGHT + y
-					] = self.world.chunks[
-						chunk_position
-					].blocks[x][y][z]
+					chunk_blocks[x * chunk.CHUNK_LENGTH * chunk.CHUNK_HEIGHT + z * chunk.CHUNK_HEIGHT + y] = (
+						self.world.chunks[chunk_position].blocks[x][y][z]
+					)
 
 		# save the chunk file
 

diff --git a/episode-13/main.py b/episode-13/main.py
@@ -208,7 +208,12 @@ class Game:
 	def __init__(self):
 		self.config = gl.Config(double_buffer=True, major_version=3, minor_version=3, depth_size=16)
 		self.window = Window(
-			config=self.config, width=800, height=600, caption="Minecraft clone", resizable=True, vsync=False
+			config=self.config,
+			width=800,
+			height=600,
+			caption="Minecraft clone",
+			resizable=True,
+			vsync=False,
 		)
 
 	def run(self):

diff --git a/episode-13/models/cactus.py b/episode-13/models/cactus.py
@@ -5,12 +5,90 @@
 colliders = [[(-0.4375, -0.5, -0.4375), (0.4375, 0.5, 0.4375)]]
 
 vertex_positions = [
-	[0.4375, 0.5000, 0.5000, 0.4375, -0.5000, 0.5000, 0.4375, -0.5000, -0.5000, 0.4375, 0.5000, -0.5000],  # right
-	[-0.4375, 0.5000, -0.5000, -0.4375, -0.5000, -0.5000, -0.4375, -0.5000, 0.5000, -0.4375, 0.5000, 0.5000],  # left
-	[0.5000, 0.5000, 0.5000, 0.5000, 0.5000, -0.5000, -0.5000, 0.5000, -0.5000, -0.5000, 0.5000, 0.5000],  # top
-	[-0.5000, -0.5000, 0.5000, -0.5000, -0.5000, -0.5000, 0.5000, -0.5000, -0.5000, 0.5000, -0.5000, 0.5000],  # bottom
-	[-0.5000, 0.5000, 0.4375, -0.5000, -0.5000, 0.4375, 0.5000, -0.5000, 0.4375, 0.5000, 0.5000, 0.4375],  # front
-	[0.5000, 0.5000, -0.4375, 0.5000, -0.5000, -0.4375, -0.5000, -0.5000, -0.4375, -0.5000, 0.5000, -0.4375],  # back
+	[
+		0.4375,
+		0.5000,
+		0.5000,
+		0.4375,
+		-0.5000,
+		0.5000,
+		0.4375,
+		-0.5000,
+		-0.5000,
+		0.4375,
+		0.5000,
+		-0.5000,
+	],  # right
+	[
+		-0.4375,
+		0.5000,
+		-0.5000,
+		-0.4375,
+		-0.5000,
+		-0.5000,
+		-0.4375,
+		-0.5000,
+		0.5000,
+		-0.4375,
+		0.5000,
+		0.5000,
+	],  # left
+	[
+		0.5000,
+		0.5000,
+		0.5000,
+		0.5000,
+		0.5000,
+		-0.5000,
+		-0.5000,
+		0.5000,
+		-0.5000,
+		-0.5000,
+		0.5000,
+		0.5000,
+	],  # top
+	[
+		-0.5000,
+		-0.5000,
+		0.5000,
+		-0.5000,
+		-0.5000,
+		-0.5000,
+		0.5000,
+		-0.5000,
+		-0.5000,
+		0.5000,
+		-0.5000,
+		0.5000,
+	],  # bottom
+	[
+		-0.5000,
+		0.5000,
+		0.4375,
+		-0.5000,
+		-0.5000,
+		0.4375,
+		0.5000,
+		-0.5000,
+		0.4375,
+		0.5000,
+		0.5000,
+		0.4375,
+	],  # front
+	[
+		0.5000,
+		0.5000,
+		-0.4375,
+		0.5000,
+		-0.5000,
+		-0.4375,
+		-0.5000,
+		-0.5000,
+		-0.4375,
+		-0.5000,
+		0.5000,
+		-0.4375,
+	],  # back
 ]
 
 tex_coords = [

diff --git a/episode-13/models/crop.py b/episode-13/models/crop.py
@@ -5,14 +5,118 @@
 colliders = []
 
 vertex_positions = [
-	[0.25, 0.4375, 0.50, 0.25, -0.5625, 0.50, 0.25, -0.5625, -0.50, 0.25, 0.4375, -0.50],  # right
-	[0.25, 0.4375, -0.50, 0.25, -0.5625, -0.50, 0.25, -0.5625, 0.50, 0.25, 0.4375, 0.50],  # right
-	[-0.25, 0.4375, -0.50, -0.25, -0.5625, -0.50, -0.25, -0.5625, 0.50, -0.25, 0.4375, 0.50],  # left
-	[-0.25, 0.4375, 0.50, -0.25, -0.5625, 0.50, -0.25, -0.5625, -0.50, -0.25, 0.4375, -0.50],  # left
-	[-0.50, 0.4375, 0.25, -0.50, -0.5625, 0.25, 0.50, -0.5625, 0.25, 0.50, 0.4375, 0.25],  # front
-	[0.50, 0.4375, 0.25, 0.50, -0.5625, 0.25, -0.50, -0.5625, 0.25, -0.50, 0.4375, 0.25],  # front
-	[0.50, 0.4375, -0.25, 0.50, -0.5625, -0.25, -0.50, -0.5625, -0.25, -0.50, 0.4375, -0.25],  # back
-	[-0.50, 0.4375, -0.25, -0.50, -0.5625, -0.25, 0.50, -0.5625, -0.25, 0.50, 0.4375, -0.25],  # back
+	[
+		0.25,
+		0.4375,
+		0.50,
+		0.25,
+		-0.5625,
+		0.50,
+		0.25,
+		-0.5625,
+		-0.50,
+		0.25,
+		0.4375,
+		-0.50,
+	],  # right
+	[
+		0.25,
+		0.4375,
+		-0.50,
+		0.25,
+		-0.5625,
+		-0.50,
+		0.25,
+		-0.5625,
+		0.50,
+		0.25,
+		0.4375,
+		0.50,
+	],  # right
+	[
+		-0.25,
+		0.4375,
+		-0.50,
+		-0.25,
+		-0.5625,
+		-0.50,
+		-0.25,
+		-0.5625,
+		0.50,
+		-0.25,
+		0.4375,
+		0.50,
+	],  # left
+	[
+		-0.25,
+		0.4375,
+		0.50,
+		-0.25,
+		-0.5625,
+		0.50,
+		-0.25,
+		-0.5625,
+		-0.50,
+		-0.25,
+		0.4375,
+		-0.50,
+	],  # left
+	[
+		-0.50,
+		0.4375,
+		0.25,
+		-0.50,
+		-0.5625,
+		0.25,
+		0.50,
+		-0.5625,
+		0.25,
+		0.50,
+		0.4375,
+		0.25,
+	],  # front
+	[
+		0.50,
+		0.4375,
+		0.25,
+		0.50,
+		-0.5625,
+		0.25,
+		-0.50,
+		-0.5625,
+		0.25,
+		-0.50,
+		0.4375,
+		0.25,
+	],  # front
+	[
+		0.50,
+		0.4375,
+		-0.25,
+		0.50,
+		-0.5625,
+		-0.25,
+		-0.50,
+		-0.5625,
+		-0.25,
+		-0.50,
+		0.4375,
+		-0.25,
+	],  # back
+	[
+		-0.50,
+		0.4375,
+		-0.25,
+		-0.50,
+		-0.5625,
+		-0.25,
+		0.50,
+		-0.5625,
+		-0.25,
+		0.50,
+		0.4375,
+		-0.25,
+	],  # back
 ]
 
 tex_coords = [

diff --git a/episode-13/models/fire.py b/episode-13/models/fire.py
@@ -5,10 +5,62 @@
 colliders = []
 
 vertex_positions = [
-	[-0.3536, 0.5000, 0.3536, -0.3536, -0.5000, 0.3536, 0.3536, -0.5000, -0.3536, 0.3536, 0.5000, -0.3536],
-	[-0.3536, 0.5000, -0.3536, -0.3536, -0.5000, -0.3536, 0.3536, -0.5000, 0.3536, 0.3536, 0.5000, 0.3536],
-	[0.3536, 0.5000, -0.3536, 0.3536, -0.5000, -0.3536, -0.3536, -0.5000, 0.3536, -0.3536, 0.5000, 0.3536],
-	[0.3536, 0.5000, 0.3536, 0.3536, -0.5000, 0.3536, -0.3536, -0.5000, -0.3536, -0.3536, 0.5000, -0.3536],
+	[
+		-0.3536,
+		0.5000,
+		0.3536,
+		-0.3536,
+		-0.5000,
+		0.3536,
+		0.3536,
+		-0.5000,
+		-0.3536,
+		0.3536,
+		0.5000,
+		-0.3536,
+	],
+	[
+		-0.3536,
+		0.5000,
+		-0.3536,
+		-0.3536,
+		-0.5000,
+		-0.3536,
+		0.3536,
+		-0.5000,
+		0.3536,
+		0.3536,
+		0.5000,
+		0.3536,
+	],
+	[
+		0.3536,
+		0.5000,
+		-0.3536,
+		0.3536,
+		-0.5000,
+		-0.3536,
+		-0.3536,
+		-0.5000,
+		0.3536,
+		-0.3536,
+		0.5000,
+		0.3536,
+	],
+	[
+		0.3536,
+		0.5000,
+		0.3536,
+		0.3536,
+		-0.5000,
+		0.3536,
+		-0.3536,
+		-0.5000,
+		-0.3536,
+		-0.3536,
+		0.5000,
+		-0.3536,
+	],
 ]
 
 tex_coords = [