From c9b4dccd7eaeed68ce96cf5167916417d0baa6a7 Mon Sep 17 00:00:00 2001
From: mat <27899617+mat-1@users.noreply.github.com>
Date: Sun, 2 Oct 2022 12:29:47 -0500
Subject: All block shapes & collisions (#22)

* start adding shapes

* add more collision stuff

* DiscreteCubeMerger

* more mergers

* start adding BitSetDiscreteVoxelShape::join

* i love rust :smiley: :smiley: :smiley:

* r

* IT COMPILES????

* fix warning

* fix error

* fix more clippy issues

* add box_shape

* more shape stuff

* make DiscreteVoxelShape an enum

* Update shape.rs

* also make VoxelShape an enum

* implement BitSet::clear

* add more missing things

* it compiles

W

* start block shape codegen

* optimize shape codegen

* make az-block/blocks.rs look better (broken)

* almost new block macro

* make the codegen not generate 'type'

* try to fix

* work more on the blocks macro

* wait it compiles

* fix clippy issues

* shapes codegen works

* well it's almost working

* simplify some shape codegen

* enum type names are correct

* W it compiles

* cargo check no longer warns

* fix some clippy issues

* start making it so the shape impl is on BlockStates

* insane code

* new impl compiles

* fix wrong find_bits + TESTS PASS!

* add a test for slab collision

* fix clippy issues

* ok rust

* fix error that happens when on stairs

* add test for top slabs

* start adding join_is_not_empty

* add more to join_is_not_empty

* top slabs still don't work!!

* x..=0 doesn't work in rust :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley:

* remove comment since i added more useful names

* remove some printlns

* fix walls in some configurations erroring

* fix some warnings

* change comment to \`\`\`ignore instead of \`\`\`no_run

* players are .6 wide not .8

* fix clippy's complaints

* i missed one clippy warning
---
 codegen/lib/extract.py | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

(limited to 'codegen/lib/extract.py')

diff --git a/codegen/lib/extract.py b/codegen/lib/extract.py
index 75e4908b..5d49ac62 100644
--- a/codegen/lib/extract.py
+++ b/codegen/lib/extract.py
@@ -123,9 +123,27 @@ def get_generator_mod_data(version_id: str, category: str):
         with open(get_dir_location(f'{generator_mod_dir}/src/main/resources/fabric.mod.json'), 'w') as f:
             json.dump(fabric_mod_json, f, indent=2)
 
-        os.system(
-            f'cd {generator_mod_dir} && gradlew runServer'
-        )
+        try: os.system(f'cd {generator_mod_dir} && chmod u+x ./gradlew')
+        except: pass
+
+        # set the server port to something other than 25565 so it doesn't
+        # conflict with anything else that's running
+        try: os.makedirs(get_dir_location(f'{generator_mod_dir}/run'))
+        except: pass
+        with open(get_dir_location(f'{generator_mod_dir}/run/server.properties'), 'w') as f:
+            f.write('server-port=56553')
+
+        # make sure we have perms to run this file
+        # (on windows it fails but keeps running)
+        os.system(f'cd {generator_mod_dir} && chmod u+x ./gradlew')
+        try:
+            subprocess.run(
+                [f'cd {generator_mod_dir} && ./gradlew runServer'],
+                check=True,
+                shell=True
+            )
+        except Exception as e:
+            os.system(f'cd {generator_mod_dir} && gradlew runServer')
 
         if os.path.exists(target_dir):
             os.unlink(target_dir)
-- 
cgit v1.2.3