Pesterenan · Pesterenan · Feb 20, 2025 · Feb 22, 2023 · Feb 22, 2023 · Feb 22, 2023
diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
@@ -23,10 +23,10 @@ jobs:
       - name: Install KRPC as a Local Library
         run: |
           mvn install:install-file \
-          -Dfile=./src/main/resources/krpc-java-0.5.2.jar \
+          -Dfile=./src/main/resources/krpc-java-0.5.4.jar \
           -DgroupId=io.github.krpc \
           -DartifactId=krpc-java \
-          -Dversion=0.5.2 \
+          -Dversion=0.5.4 \
           -Dpackaging=jar
 
       - name: Set up JDK 17

diff --git a/.github/workflows/release-new-version.yml b/.github/workflows/release-new-version.yml
@@ -21,10 +21,10 @@ jobs:
       - name: Install KRPC as a Local Library
         run: |
           mvn install:install-file \
-          -Dfile=./src/main/resources/krpc-java-0.5.2.jar \
+          -Dfile=./src/main/resources/krpc-java-0.5.4.jar \
           -DgroupId=io.github.krpc \
           -DartifactId=krpc-java \
-          -Dversion=0.5.2 \
+          -Dversion=0.5.4 \
           -Dpackaging=jar
 
       - name: Set up JDK 17

diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 .shelf/
 .idea/
-.settings/
 bin/
 tmp/
 *.tmp

diff --git a/.settings/org.eclipse.core.runtime.prefs b/.settings/org.eclipse.core.runtime.prefs
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,22 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+# Java Version
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.processAnnotations=disabled
-org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
+
+# Indentation
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.indentation.size=4
+
+# Braces
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+
+# Line Wrapping
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+
+# Other
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=true
diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+formatter_profile=_custom
+formatter_settings_version=12
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ manobras, e pilotar rovers.
 ---
 É necessário ter o [Java](https://java.com/pt-BR/) instalado para utilizar o "MechPeste.jar".
 Uma versão mais atualizada do
-mod [KRPC](https://github.com/krpc/krpc/releases/download/v0.5.2/krpc-0.5.2.zip)
+mod [KRPC](https://github.com/krpc/krpc)
 pode ser instalada diretamente do aplicativo MechPeste pelo menu Arquivo > Instalar KRPC.
 
 ## **Como instalar:**
@@ -78,14 +78,14 @@ mover para o alvo, desviando dos obstáculos à frente.
 
 Agora o MechPeste tem como base o gerenciador de dependências Maven. Para poder instalar a biblioteca
 do KRPC no entanto, como não está disponível no repositório público do Maven, é necessário fazer o download
-e instalar a biblioteca KRPC em sua versão 0.5.2 com o seguinte comando:
+e instalar a biblioteca KRPC em sua versão 0.5.4 com o seguinte comando:
 
 ``` bash
 mvn install:install-file \
-    -Dfile=<CAMINHO_DO_DOWNLOAD>\krpc-java-0.5.2.jar \
+    -Dfile=<CAMINHO_DO_DOWNLOAD>\krpc-java-0.5.4.jar \
     -DgroupId=io.github.krpc \
     -DartifactId=krpc-java \
-    -Dversion=0.5.2 \
+    -Dversion=0.5.4 \
     -Dpackaging=jar \
 ```
 Substitua `<CAMINHO_DO_DOWNLOAD>` pela pasta onde está o arquivo do KRPC. Isso instalará essa biblioteca 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>com.pesterenan</groupId>
   <artifactId>MechPeste</artifactId>
-  <version>0.7.1</version>
+  <version>0.8.0</version>
 
   <build>
     <plugins>
@@ -15,8 +15,8 @@
         <version>3.11.0</version>
         <configuration>
           <encoding>UTF-8</encoding>
-          </configuration>
-        </plugin>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -25,10 +25,10 @@
           <archive>
             <manifest>
               <mainClass>com.pesterenan.MechPeste</mainClass>
-              </manifest>
-            </archive>
-          </configuration>
-        </plugin>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -37,53 +37,66 @@
           <archive>
             <manifest>
               <mainClass>com.pesterenan.MechPeste</mainClass>
-              </manifest>
-            </archive>
+            </manifest>
+          </archive>
           <descriptorRefs>
             <descriptorRef>jar-with-dependencies</descriptorRef>
-            </descriptorRefs>
+          </descriptorRefs>
           <finalName>MechPeste-${project.version}</finalName>
           <appendAssemblyId>false</appendAssemblyId>
-          </configuration>
+        </configuration>
         <executions>
           <execution>
             <id>make-assembly</id>
             <phase>package</phase>
             <goals>
               <goal>single</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-      </plugins>
-    </build>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <version>2.37.0</version>
+        <configuration>
+          <java>
+            <eclipse>
+              <version>4.19</version>
+              <file>${project.basedir}/.settings/org.eclipse.jdt.core.prefs</file>
+            </eclipse>
+          </java>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
   <properties>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
+  </properties>
 
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
       <version>3.3.9</version>
-      </dependency>
+    </dependency>
     <dependency>
       <groupId>io.github.krpc</groupId>
       <artifactId>krpc-java</artifactId>
-      <version>0.5.2</version>
-      </dependency>
+      <version>0.5.4</version>
+    </dependency>
     <dependency>
       <groupId>org.javatuples</groupId>
       <artifactId>javatuples</artifactId>
       <version>1.2</version>
-      </dependency>
+    </dependency>
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
       <version>3.22.1</version>
-      </dependency>
-    </dependencies>
+    </dependency>
+  </dependencies>
 
-  </project>
+</project>
diff --git a/src/main/java/com/pesterenan/Main.java b/src/main/java/com/pesterenan/Main.java
@@ -159,8 +159,7 @@ public static void main(String[] args) {
                 currentZAxisSpeed = (targetPosition.z - lastZTargetPos) * sleepTime;
 
                 // Calcular a aceleração para cada eixo no RCS:
-                float forwardsError = calculateThrottle(5, 10, currentYAxisSpeed,
-                        targetPosition.y, SPEED_LIMIT);
+                float forwardsError = calculateThrottle(5, 10, currentYAxisSpeed, targetPosition.y, SPEED_LIMIT);
                 float sidewaysError = calculateThrottle(-1, 10, currentXAxisSpeed, targetPosition.x, SPEED_LIMIT);
                 float upwardsError = calculateThrottle(-1, 10, currentZAxisSpeed, targetPosition.z, SPEED_LIMIT);
                 control.setForward((float) forwardsError);
@@ -190,17 +189,12 @@ private static float calculateThrottle(double minDistance, double maxDistance, d
 
     private static void createLines(Vector start, Vector end) {
         try {
-            distanceLine = drawing.addLine(start.toTriplet(),
-                    end.toTriplet(), vesselRefFrame, true);
-            distLineXAxis = drawing.addLine(start.toTriplet(),
-                    new Vector(end.x, 0.0, 0.0).toTriplet(),
-                    vesselRefFrame, true);
-            distLineYAxis = drawing.addLine(start.toTriplet(),
-                    new Vector(end.x, end.y, 0.0).toTriplet(),
-                    vesselRefFrame, true);
-            distLineZAxis = drawing.addLine(start.toTriplet(),
-                    end.toTriplet(),
+            distanceLine = drawing.addLine(start.toTriplet(), end.toTriplet(), vesselRefFrame, true);
+            distLineXAxis = drawing.addLine(start.toTriplet(), new Vector(end.x, 0.0, 0.0).toTriplet(), vesselRefFrame,
+                    true);
+            distLineYAxis = drawing.addLine(start.toTriplet(), new Vector(end.x, end.y, 0.0).toTriplet(),
                     vesselRefFrame, true);
+            distLineZAxis = drawing.addLine(start.toTriplet(), end.toTriplet(), vesselRefFrame, true);
             distanceLine.setThickness(0.5f);
             distLineXAxis.setThickness(0.25f);
             distLineYAxis.setThickness(0.25f);
-Original file line number
+Diff line change
@@ -1,6 +1,5 @@
     .shelf/
     .idea/
-    .settings/
     bin/
     tmp/
     *.tmp
@@ Expand Down @@