Browse Source

moved to clang-formatter

Kolja Strohm 1 year ago
parent
commit
52a2af29f3
51 changed files with 547 additions and 68 deletions
  1. 117 0
      .clang-format
  2. 69 0
      .editorconfig
  3. 1 1
      Allgemein/3DCreator
  4. 1 1
      Allgemein/Framework
  5. 1 1
      Allgemein/GSL
  6. 1 1
      Allgemein/Network
  7. 1 1
      Allgemein/ksgScript
  8. 1 1
      Apps/AppServer
  9. BIN
      Spiele Platform/Klient/Fertig/Debug/x64/data/version
  10. BIN
      Spiele Platform/Klient/Fertig/x32/data/version
  11. BIN
      Spiele Platform/Klient/Fertig/x64/data/version
  12. 17 17
      Spiele Platform/Klient/Include/SpielStatistikV.h
  13. 10 10
      Spiele Platform/Klient/Include/Update.h
  14. 1 1
      Spiele Platform/Klient/KSGClient
  15. 1 1
      Spiele Platform/Klient/KSGNetwork
  16. 1 1
      Spiele Platform/Klient/Minigames/Asteroids
  17. 1 1
      Spiele Platform/Klient/Minigames/Blöcke
  18. 1 1
      Spiele Platform/Klient/Minigames/DungeonGame
  19. 1 1
      Spiele Platform/Klient/Minigames/Fangen
  20. 1 1
      Spiele Platform/Klient/Minigames/Snake
  21. 1 1
      Spiele Platform/Klient/Minigames/Tetris
  22. 1 1
      Spiele Platform/Klient/Start
  23. 1 1
      Spiele Platform/Klient/Update
  24. 1 1
      Spiele Platform/Klient/patcher
  25. 1 1
      Spiele Platform/SMP
  26. 1 1
      Spiele Platform/Server/Anmeldung Server
  27. 1 1
      Spiele Platform/Server/Chat Server
  28. 1 1
      Spiele Platform/Server/Editor Server
  29. 1 1
      Spiele Platform/Server/Erhaltung Server
  30. 1 1
      Spiele Platform/Server/Historie Server
  31. 1 1
      Spiele Platform/Server/Information Server
  32. 1 1
      Spiele Platform/Server/Karten Server
  33. 1 1
      Spiele Platform/Server/Login Server
  34. 1 1
      Spiele Platform/Server/Main Server
  35. 1 1
      Spiele Platform/Server/Minigame Server
  36. 1 1
      Spiele Platform/Server/News Server
  37. 1 1
      Spiele Platform/Server/Patch Server
  38. 1 1
      Spiele Platform/Server/Register Server
  39. 1 1
      Spiele Platform/Server/Shop Server
  40. 1 1
      Spiele Platform/Server/Spiel Server
  41. 1 1
      Spiele Platform/Spiele/Klient/Asteroids
  42. 1 1
      Spiele Platform/Spiele/Klient/Linie
  43. 1 1
      Spiele Platform/Spiele/Klient/Stickman-World
  44. 1 1
      Spiele Platform/Spiele/Server/Asteroids
  45. 1 1
      Spiele Platform/Spiele/Server/Linie
  46. 1 1
      Spiele Platform/Spiele/Server/Stickman-World
  47. 85 0
      Spiele Platform/Standalown/Fertig/FactoryCraft/Server/data/recipies/recipieValidation.xml
  48. 207 0
      Spiele Platform/Standalown/Fertig/FactoryCraft/Server/data/recipies/tools.json
  49. 1 1
      Spiele Platform/Standalown/Klient/FactoryCraft
  50. 1 1
      Spiele Platform/Standalown/Server/FactoryCraft
  51. 1 0
      remove_vs_caches.bat

+ 117 - 0
.clang-format

@@ -0,0 +1,117 @@
+AccessModifierOffset: 0
+AlignAfterOpenBracket: DontAlign
+AlignArrayOfStructures: Left
+AlignConsecutiveAssignments: false
+AlignConsecutiveBitFields: true
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Left
+AlignOperands: AlignAfterOperator
+AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: Empty
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortEnumsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: WithoutElse
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: No
+BinPackArguments: false
+BinPackParameters: false
+
+BreakBeforeBraces: Custom
+BraceWrapping: 
+  AfterCaseLabel: true
+  AfterClass: true
+  AfterControlStatement: Always
+  AfterEnum: true
+  AfterFunction: true
+  AfterNamespace: true
+  AfterObjCDeclaration: true
+  AfterStruct: true
+  AfterUnion: true
+  AfterExternBlock: true
+  BeforeCatch: false
+  BeforeElse: true
+  BeforeLambdaBody: false
+  BeforeWhile: false
+  IndentBraces: false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+
+BreakBeforeBinaryOperators: All
+BreakBeforeConceptDeclarations: false
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeColon
+BreakInheritanceList: AfterComma
+BreakStringLiterals: true
+ColumnLimit: 80
+CompactNamespaces: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DeriveLineEnding: true
+DerivePointerAlignment: false
+DisableFormat: false
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: Always
+FixNamespaceComments: true
+
+IncludeBlocks: Regroup
+IncludeCategories:
+  - Regex:           '<.+>'
+    Priority:        1
+  - Regex:           '".+"'
+    Priority:        2
+
+IndentAccessModifiers: false
+IndentCaseBlocks: true
+IndentCaseLabels: false
+IndentExternBlock: Indent
+IndentGotoLabels: false
+IndentPPDirectives: AfterHash
+IndentWidth: 4
+InsertTrailingCommas: Wrapped
+KeepEmptyLinesAtTheStartOfBlocks: false
+LambdaBodyIndentation: Signature
+Language: Cpp
+NamespaceIndentation: All
+PPIndentWidth: 4
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+AllowAllConstructorInitializersOnNextLine: true
+PointerAlignment: Left
+ReferenceAlignment: Left
+ReflowComments: true
+SortIncludes: CaseInsensitive
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon : true
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: Never
+SpacesInCStyleCastParentheses: false
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: false
+
+SpacesInLineCommentPrefix:
+  Minimum: 1
+  Maximum: 1
+
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: Latest
+TabWidth: 4
+UseTab: Never

+ 69 - 0
.editorconfig

@@ -0,0 +1,69 @@
+# Eine von Visual Studio generierte .editorconfig-Datei mit C++-Einstellungen.
+root = true
+
+[*.{c++,cc,cpp,cppm,cxx,h,h++,hh,hpp,hxx,inl,ipp,ixx,tlh,tli}]
+
+# Visual C++-Codeformateinstellungen
+
+cpp_generate_documentation_comments = xml
+
+# Visual C++-Formatierungseinstellungen
+
+cpp_indent_braces = false
+cpp_indent_multi_line_relative_to = innermost_parenthesis
+cpp_indent_within_parentheses = indent
+cpp_indent_preserve_within_parentheses = true
+cpp_indent_case_contents = true
+cpp_indent_case_labels = false
+cpp_indent_case_contents_when_block = false
+cpp_indent_lambda_braces_when_parameter = true
+cpp_indent_goto_labels = one_left
+cpp_indent_preprocessor = leftmost_column
+cpp_indent_access_specifiers = false
+cpp_indent_namespace_contents = true
+cpp_indent_preserve_comments = false
+cpp_new_line_before_open_brace_namespace = new_line
+cpp_new_line_before_open_brace_type = new_line
+cpp_new_line_before_open_brace_function = new_line
+cpp_new_line_before_open_brace_block = new_line
+cpp_new_line_before_open_brace_lambda = new_line
+cpp_new_line_scope_braces_on_separate_lines = true
+cpp_new_line_close_brace_same_line_empty_type = true
+cpp_new_line_close_brace_same_line_empty_function = true
+cpp_new_line_before_catch = true
+cpp_new_line_before_else = true
+cpp_new_line_before_while_in_do_while = false
+cpp_space_before_function_open_parenthesis = remove
+cpp_space_within_parameter_list_parentheses = false
+cpp_space_between_empty_parameter_list_parentheses = false
+cpp_space_after_keywords_in_control_flow_statements = true
+cpp_space_within_control_flow_statement_parentheses = false
+cpp_space_before_lambda_open_parenthesis = false
+cpp_space_within_cast_parentheses = false
+cpp_space_after_cast_close_parenthesis = false
+cpp_space_within_expression_parentheses = false
+cpp_space_before_block_open_brace = true
+cpp_space_between_empty_braces = false
+cpp_space_before_initializer_list_open_brace = false
+cpp_space_within_initializer_list_braces = true
+cpp_space_preserve_in_initializer_list = true
+cpp_space_before_open_square_bracket = false
+cpp_space_within_square_brackets = false
+cpp_space_before_empty_square_brackets = false
+cpp_space_between_empty_square_brackets = false
+cpp_space_group_square_brackets = true
+cpp_space_within_lambda_brackets = false
+cpp_space_between_empty_lambda_brackets = false
+cpp_space_before_comma = false
+cpp_space_after_comma = true
+cpp_space_remove_around_member_operators = true
+cpp_space_before_inheritance_colon = true
+cpp_space_before_constructor_colon = true
+cpp_space_remove_before_semicolon = true
+cpp_space_after_semicolon = true
+cpp_space_remove_around_unary_operator = true
+cpp_space_around_binary_operator = insert
+cpp_space_around_assignment_operator = insert
+cpp_space_pointer_reference_alignment = left
+cpp_space_around_ternary_operator = insert
+cpp_wrap_preserve_blocks = one_liners

+ 1 - 1
Allgemein/3DCreator

@@ -1 +1 @@
-Subproject commit 351897ac27699bf0a31ad120a2247523f2d0c4da
+Subproject commit c1f296b57f2583c1bb14641d2932b6374810ed00

+ 1 - 1
Allgemein/Framework

@@ -1 +1 @@
-Subproject commit d67c918b0f57211c4f400c2a190781a2878b7aef
+Subproject commit e50fc87bc1acb45c985f15865b3b5642d82eae1d

+ 1 - 1
Allgemein/GSL

@@ -1 +1 @@
-Subproject commit 595172574ea85b1c33a45998d5f2ba1d89ef6ac4
+Subproject commit dc2545eb9f40534cf939c398c12a5afce650f3a5

+ 1 - 1
Allgemein/Network

@@ -1 +1 @@
-Subproject commit e840fa8e5b4bbe861b44319f150a42943d488399
+Subproject commit 2fc13ed6c8a59f23ac9ed60a4f9b7b5176cf2e31

+ 1 - 1
Allgemein/ksgScript

@@ -1 +1 @@
-Subproject commit f45c65c8d6dda711ceff3bd7271ff3a6b7c45028
+Subproject commit a0bc09f9e4bb2ab10fe3a111f3ddc3dddbff426f

+ 1 - 1
Apps/AppServer

@@ -1 +1 @@
-Subproject commit 6eaaed142e87c46a6bce2ffa660d8b6ce76f5a5f
+Subproject commit 39683dfb860f9471be3adc948dbf328943988dd3

BIN
Spiele Platform/Klient/Fertig/Debug/x64/data/version


BIN
Spiele Platform/Klient/Fertig/x32/data/version


BIN
Spiele Platform/Klient/Fertig/x64/data/version


+ 17 - 17
Spiele Platform/Klient/Include/SpielStatistikV.h

@@ -12,23 +12,23 @@ using namespace Framework;
 class SpielStatistikV : public virtual ReferenceCounter
 {
 public:
-    // nicht constant
-    virtual void bereit() = 0;
-    virtual void setBilder( BilderV *b ) = 0;
-    virtual void setAccountId( int id ) = 0;
-    virtual void setRückrufFunktionen( void( *addNachrichtF )( void *, Text *, Text *, Text *, Text * ),
-                                       void( *addChatF )( void *, int ), void( *addFreundF )( void *, int ),
-                                       void( *accountAnsehenF )( void *, int ), bool( *istFreundF )( void *, int ), void *nachrichtParam ) = 0;
-    virtual void setUIFactory( UIInit &factory ) = 0;
-    virtual void setKlients( KSGClient::InformationServerClient *infoc, KSGClient::SpielServerClient *spielc ) = 0;
-    virtual void nachricht( int län, char *bytes ) = 0;
-    virtual void doPublicMausEreignis( MausEreignis &me ) = 0;
-    virtual void doTastaturEreignis( TastaturEreignis &te ) = 0;
-    virtual bool tick( double zeit ) = 0;
-    virtual void render( Bild &zRObj ) = 0;
-    virtual void verlassen() = 0;
-    // constant
-    virtual int getStatus() const = 0; // 0 = laden, 1 = läuft, 2 = fortsetzen
+	// nicht constant
+	virtual void bereit() = 0;
+	virtual void setBilder(BilderV* b) = 0;
+	virtual void setAccountId(int id) = 0;
+	virtual void setRückrufFunktionen(void(*addNachrichtF)(void*, Text*, Text*, Text*, Text*),
+		void(*addChatF)(void*, int), void(*addFreundF)(void*, int),
+		void(*accountAnsehenF)(void*, int), bool(*istFreundF)(void*, int), void* nachrichtParam) = 0;
+	virtual void setUIFactory(UIInit& factory) = 0;
+	virtual void setKlients(KSGClient::InformationServerClient* infoc, KSGClient::SpielServerClient* spielc) = 0;
+	virtual void nachricht(int län, const char* bytes) = 0;
+	virtual void doPublicMausEreignis(MausEreignis& me) = 0;
+	virtual void doTastaturEreignis(TastaturEreignis& te) = 0;
+	virtual bool tick(double zeit) = 0;
+	virtual void render(Bild& zRObj) = 0;
+	virtual void verlassen() = 0;
+	// constant
+	virtual int getStatus() const = 0; // 0 = laden, 1 = läuft, 2 = fortsetzen
 };
 
 #endif

+ 10 - 10
Spiele Platform/Klient/Include/Update.h

@@ -7,21 +7,21 @@
 
 struct UpdateParams
 {
-    int dateiGruppe;
-    bool *abbruch;
-    Framework::TextFeld *zStatus;
-    Framework::FBalken *zFortschritt;
+	int dateiGruppe;
+	bool* abbruch;
+	Framework::TextFeld* zStatus;
+	Framework::FBalken* zFortschritt;
 };
 
 class UpdaterV : public virtual Framework::ReferenceCounter
 {
 public:
-    // nicht constant
-    virtual int getNextDateiGruppe( Framework::Text *zDgPfad ) = 0;
-    virtual int update( UpdateParams *zParams ) = 0;
-    // constant
-    virtual char *getError() const = 0;
-    virtual int getDownload() const = 0;
+	// nicht constant
+	virtual int getNextDateiGruppe(Framework::Text* zDgPfad) = 0;
+	virtual int update(UpdateParams* zParams) = 0;
+	// constant
+	virtual const char* getError() const = 0;
+	virtual int getDownload() const = 0;
 };
 
 #endif

+ 1 - 1
Spiele Platform/Klient/KSGClient

@@ -1 +1 @@
-Subproject commit 2724f2a8ef4b9bc898a07da4ddf4c6b5631b5d6b
+Subproject commit f4b5c250d76a656542f65a712b6022ab0aa76141

+ 1 - 1
Spiele Platform/Klient/KSGNetwork

@@ -1 +1 @@
-Subproject commit 53ca1f85357772257402cd77883472cc91fa1c20
+Subproject commit 25d33da2f55263059f52b9d724528d0ebbfabbe8

+ 1 - 1
Spiele Platform/Klient/Minigames/Asteroids

@@ -1 +1 @@
-Subproject commit 757f535f97379caa90aeb699cb3ade92c69ee6de
+Subproject commit cf351173ecb9c01e4d62c5984c0bbfcf4faa3fd6

+ 1 - 1
Spiele Platform/Klient/Minigames/Blöcke

@@ -1 +1 @@
-Subproject commit 0ccab14bb11b66cc712babafd89a2c22f5d68306
+Subproject commit d2a225130ef052083f0269f30b977ebb3fcd10ff

+ 1 - 1
Spiele Platform/Klient/Minigames/DungeonGame

@@ -1 +1 @@
-Subproject commit cc09a638ffae838660b881c97ab702825939fcc3
+Subproject commit 05a7824ac775522ddedef872c0d556bdb752a1ba

+ 1 - 1
Spiele Platform/Klient/Minigames/Fangen

@@ -1 +1 @@
-Subproject commit 007696fb606a96d3176e2efa3f1154ec4ad8dc83
+Subproject commit f33d7d39aa41e8c2f5da8ba643529bc692c07f0a

+ 1 - 1
Spiele Platform/Klient/Minigames/Snake

@@ -1 +1 @@
-Subproject commit 5bd8f9b3b10aa4487afe37d6880992be57613bbe
+Subproject commit a7c65aa95d18d0b0969de57967d11ba061be6271

+ 1 - 1
Spiele Platform/Klient/Minigames/Tetris

@@ -1 +1 @@
-Subproject commit 2851961eb03a46301910b664dd9448e1ba28b9a1
+Subproject commit 3b3e0dcb6d14bb9fc277df404a4005c607be8b25

+ 1 - 1
Spiele Platform/Klient/Start

@@ -1 +1 @@
-Subproject commit f45a3f981b5c0ed1b680f1a29cf2560a8fe4e719
+Subproject commit c886db33464ef6dab4de4f7a7e3b54e0df5863e0

+ 1 - 1
Spiele Platform/Klient/Update

@@ -1 +1 @@
-Subproject commit ee638f77c363bdf5b474a77254ba6b15666247db
+Subproject commit c63f579afc190af54db93f3c6fd0a1aeb931b988

+ 1 - 1
Spiele Platform/Klient/patcher

@@ -1 +1 @@
-Subproject commit d7caf3e1db53ce0bbf76e80020f89cff35a27bbe
+Subproject commit ddab274315fa1995ed364e0b3cd73d12af6d5368

+ 1 - 1
Spiele Platform/SMP

@@ -1 +1 @@
-Subproject commit 598e7a6b806d2e31aade7478f072bb25807d0ae1
+Subproject commit 5630a2155c2b23b8fa90048a218545616d4d1ac2

+ 1 - 1
Spiele Platform/Server/Anmeldung Server

@@ -1 +1 @@
-Subproject commit f0687e7574662f0ae42ec57e1b1ea9eb2f3b1c44
+Subproject commit db757e5dbee0a0db848d306c83dd4d96ca523a7c

+ 1 - 1
Spiele Platform/Server/Chat Server

@@ -1 +1 @@
-Subproject commit 876b481fef85f265e679a6ba83bd6effbfc06449
+Subproject commit 4cd0115fac5231397a2fb39cfe3987f9a5dd2053

+ 1 - 1
Spiele Platform/Server/Editor Server

@@ -1 +1 @@
-Subproject commit e73c1a3ed3b874f9288b5f752441b4526ef250e4
+Subproject commit 2488c7bd8d16d88f9940f196dde05b2a72844d6d

+ 1 - 1
Spiele Platform/Server/Erhaltung Server

@@ -1 +1 @@
-Subproject commit 9744fb9fb4c19d41a386b6012ea691d653f0dc02
+Subproject commit b3915fcdf862a795f2cbe2b1d91c81c0a26bf71f

+ 1 - 1
Spiele Platform/Server/Historie Server

@@ -1 +1 @@
-Subproject commit 9f386e783d9d14ff203d7386b7fb207fa4847b4f
+Subproject commit 4ee52ead3103c7caffb200aad2791b5fcc712d95

+ 1 - 1
Spiele Platform/Server/Information Server

@@ -1 +1 @@
-Subproject commit 754e2d87c3560f7ae4d2a4c6cb53229c8c05ac0c
+Subproject commit 486364cccd5d129fcca519b3d9a3301a8bf0087c

+ 1 - 1
Spiele Platform/Server/Karten Server

@@ -1 +1 @@
-Subproject commit a6739310f1d0d1da92659ea334c8d5f3f78b8ddb
+Subproject commit a2b92691bc927930f0aad641dced5e82ccff78f4

+ 1 - 1
Spiele Platform/Server/Login Server

@@ -1 +1 @@
-Subproject commit 590777db978096ef399f83386cf3188811bd592c
+Subproject commit 97d2507eed13a543693252b31ef4bc730d0913e2

+ 1 - 1
Spiele Platform/Server/Main Server

@@ -1 +1 @@
-Subproject commit b5dd089e2fa435561f2610f3622d94ce014aa0b9
+Subproject commit b1ccafebb54edff97234039f92bb9d169b1bee10

+ 1 - 1
Spiele Platform/Server/Minigame Server

@@ -1 +1 @@
-Subproject commit a79d4bb1db5276934b0918101e52fec7b5135030
+Subproject commit 41a47a005f661c9dc62ac65e19a20f9ed6ff6376

+ 1 - 1
Spiele Platform/Server/News Server

@@ -1 +1 @@
-Subproject commit 7c4dfa47926cfd5662d07872468f4ac5d658bfc9
+Subproject commit 2c9e412b5dc058224cdc7dc4717b44dd30202420

+ 1 - 1
Spiele Platform/Server/Patch Server

@@ -1 +1 @@
-Subproject commit fb9553c71f4387a6c0d5ced6f701eae3490e148f
+Subproject commit f22d6d0b3a2a6ef0668979c0c615d95b30603d6e

+ 1 - 1
Spiele Platform/Server/Register Server

@@ -1 +1 @@
-Subproject commit 9c32d91605313554ea7675175493e107a4202cbe
+Subproject commit 6eef76c0fda135257aa5734043a556d1c582f25e

+ 1 - 1
Spiele Platform/Server/Shop Server

@@ -1 +1 @@
-Subproject commit 70e74c3f70690f3101586aafb691ab977b72bfba
+Subproject commit 4c3fbf1ee8a14617389d94487903cb521b4dda92

+ 1 - 1
Spiele Platform/Server/Spiel Server

@@ -1 +1 @@
-Subproject commit 14ee636a0fe99e44ce84343e042dc8124cbe4ad4
+Subproject commit bfa26b8bfee29d5dfffe122e1a1cffeecdb23539

+ 1 - 1
Spiele Platform/Spiele/Klient/Asteroids

@@ -1 +1 @@
-Subproject commit bdc8b935e4604f4ccd4827d4ad955eb24d60db11
+Subproject commit 66be7bc0206da81b248786b71b0eec09e716dc63

+ 1 - 1
Spiele Platform/Spiele/Klient/Linie

@@ -1 +1 @@
-Subproject commit af72e741d044336dae6b0d985785328efb407dcb
+Subproject commit 23bfa1c474378d710eddee7e1a86f0b85ca1a0d5

+ 1 - 1
Spiele Platform/Spiele/Klient/Stickman-World

@@ -1 +1 @@
-Subproject commit 88f43f49e77599c237f1a663cd774b0fb3f587b6
+Subproject commit fd105a9b961c6de0efd62f1f3a19cba095a42f43

+ 1 - 1
Spiele Platform/Spiele/Server/Asteroids

@@ -1 +1 @@
-Subproject commit 591bb09c435ea64eb4116b5389aa61f4c3851d93
+Subproject commit 580c2611eeb5828233e49279e64dec19fe40f28d

+ 1 - 1
Spiele Platform/Spiele/Server/Linie

@@ -1 +1 @@
-Subproject commit c925ea6548c55914339818ce7943c3a203fe786b
+Subproject commit cd8a59c4d35db17d7145bd1c26024ff0af80676a

+ 1 - 1
Spiele Platform/Spiele/Server/Stickman-World

@@ -1 +1 @@
-Subproject commit 5b72f13e318a1f4ee343776f3d0705fcff82c67d
+Subproject commit 70ff437dd05c9616143fffa19678ad0996a20489

+ 85 - 0
Spiele Platform/Standalown/Fertig/FactoryCraft/Server/data/recipies/recipieValidation.xml

@@ -0,0 +1,85 @@
+<array typeSpecifiedBy="type">
+	<object>
+		<value name="type">
+			<string equals="shaped"/>
+		</value>
+		<value name="group">
+			<string/>
+		</value>
+		<value name="width">
+			<number greater="0"/>
+		</value>
+		<value name="height">
+			<number greater="0"/>
+		</value>
+		<value name="inputs">
+			<array>
+				<object>
+					<value name="x">
+						<number greaterOrEqual="0"/>
+					</value>
+					<value name="y">
+						<number greaterOrEqual="0"/>
+					</value>
+					<value name="filter">
+						<object>
+							<value name="itemType">
+								<string/>
+							</value>
+						</object>
+					</value>
+				</object>
+			</array>
+		</value>
+		<value name="output">
+			<object>
+				<value name="itemType">
+					<string/>
+				</value>
+			</object>
+		</value>
+		<value name="outputCount">
+			<number greater="0"/>
+		</value>
+	</object>
+	<object>
+		<value name="type">
+			<string equals="unordered"/>
+		</value>
+		<value name="group">
+			<string/>
+		</value>
+		<value name="inputs">
+			<array>
+				<object>
+					<value name="count">
+						<number greater="0"/>
+					</value>
+					<value name="filter">
+						<object>
+							<value name="itemType">
+								<string/>
+							</value>
+						</object>
+					</value>
+				</object>
+			</array>
+		</value>
+		<value name="output">
+			<array>
+				<object>
+					<value name="filter">
+						<object>
+							<value name="itemType">
+								<string/>
+							</value>
+						</object>
+					</value>
+					<value name="count">
+						<number greater="0"/>
+					</value>
+				</object>
+			</array>
+		</value>
+	</object>
+</array>

+ 207 - 0
Spiele Platform/Standalown/Fertig/FactoryCraft/Server/data/recipies/tools.json

@@ -0,0 +1,207 @@
+[
+	{
+		"type": "shaped",
+		"group": "inventory",
+		"width": 1,
+		"height": 2,
+		"inputs": [
+			{
+				"x": 0,
+				"y": 0,
+				"filter": {
+					"itemType": "Cobble"
+				}
+			},
+			{
+				"x": 0,
+				"y": 1,
+				"filter": {
+					"itemType": "Cobble"
+				}
+			}
+		],
+		"output": {
+			"itemType": "StoneTool"
+		}
+	},
+	{
+		"type": "shaped",
+		"group": "inventory",
+		"width": 1,
+		"height": 2,
+		"inputs": [
+			{
+				"x": 0,
+				"y": 0,
+				"filter": {
+					"itemType": "StoneTool"
+				},
+				"modifiers": [
+					{
+						"attribute": "hp",
+						"value": "-=0.1"
+					}
+				]
+			},
+			{
+				"x": 0,
+				"y": 1,
+				"filter": {
+					"itemType": "Stone"
+				}
+			}
+		],
+		"output": {
+			"itemType": "Cobble"
+		}
+	},
+	{
+		"type": "shaped",
+		"group": "inventory",
+		"width": 1,
+		"height": 2,
+		"inputs": [
+			{
+				"x": 0,
+				"y": 0,
+				"filter": {
+					"itemType": "StoneTool"
+				},
+				"modifiers": [
+					{
+						"attribute": "hp",
+						"value": "-=0.1"
+					}
+				]
+			},
+			{
+				"x": 0,
+				"y": 1,
+				"filter": {
+					"itemType": "Oak"
+				}
+			}
+		],
+		"output": {
+			"itemType": "WoodenStick"
+		}
+	},
+	{
+		"type": "shaped",
+		"group": "inventory",
+		"width": 1,
+		"height": 2,
+		"inputs": [
+			{
+				"x": 0,
+				"y": 0,
+				"filter": {
+					"itemType": "StoneTool"
+				},
+				"modifiers": [
+					{
+						"attribute": "hp",
+						"value": "-=0.1"
+					}
+				]
+			},
+			{
+				"x": 0,
+				"y": 1,
+				"filter": {
+					"itemType": "Birch"
+				}
+			}
+		],
+		"output": {
+			"itemType": "WoodenStick"
+		}
+	},
+	{
+		"type": "shaped",
+		"group": "inventory",
+		"width": 1,
+		"height": 2,
+		"inputs": [
+			{
+				"x": 0,
+				"y": 0,
+				"filter": {
+					"itemType": "StoneTool"
+				},
+				"modifiers": [
+					{
+						"attribute": "hp",
+						"value": "-=0.1"
+					}
+				]
+			},
+			{
+				"x": 0,
+				"y": 1,
+				"filter": {
+					"itemType": "Beech"
+				}
+			}
+		],
+		"output": {
+			"itemType": "WoodenStick"
+		}
+	},
+	{
+		"type": "shaped",
+		"group": "inventory",
+		"width": 1,
+		"height": 2,
+		"inputs": [
+			{
+				"x": 0,
+				"y": 0,
+				"filter": {
+					"itemType": "StoneTool"
+				},
+				"modifiers": [
+					{
+						"attribute": "hp",
+						"value": "-=0.1"
+					}
+				]
+			},
+			{
+				"x": 0,
+				"y": 1,
+				"filter": {
+					"itemType": "Pine"
+				}
+			}
+		],
+		"output": {
+			"itemType": "Resin"
+		}
+	},
+	{
+		"type": "shaped",
+		"group": "inventory",
+		"width": 1,
+		"height": 2,
+		"inputs": [
+			{
+				"x": 0,
+				"y": 0,
+				"filter": {
+					"itemType": "Resin"
+				}
+			},
+			{
+				"x": 0,
+				"y": 1,
+				"filter": {
+					"itemType": "WoodenStick"
+				}
+			}
+		],
+		"output": {
+			"itemType": "Torch"
+		}
+	}
+]

+ 1 - 1
Spiele Platform/Standalown/Klient/FactoryCraft

@@ -1 +1 @@
-Subproject commit eae1cfdd7e9f5d512a7a1762f7d5c574e2c9b3e5
+Subproject commit 1d9ed048fff1b2f60a3223f94cd0831f0d9e35e7

+ 1 - 1
Spiele Platform/Standalown/Server/FactoryCraft

@@ -1 +1 @@
-Subproject commit 9ed02e7d9e2ed0dedf3cc47aea1916733ff1dbb6
+Subproject commit 225a611a6834713021638a5ce382ea3be7d10838

+ 1 - 0
remove_vs_caches.bat

@@ -0,0 +1 @@
+FOR /d /r . %%d IN (".vs") DO @IF EXIST "%%d" rd /s /q "%%d"