AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-15 18:34:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Bixilon 2021-02-08 13:48:34 +01:00
commit a63472ad3e
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pom.xml
View File

@ -73,6 +73,35 @@
<compilerArgs>--enable-preview</compilerArgs> <compilerArgs>--enable-preview</compilerArgs>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<archive>
<manifest>
<mainClass>de.bixilon.minosoft.Minosoft</mainClass>
</manifest>
</archive>
</configuration>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
@ -82,7 +111,7 @@
<maven.compiler.source>15</maven.compiler.source> <maven.compiler.source>15</maven.compiler.source>
<maven.compiler.target>15</maven.compiler.target> <maven.compiler.target>15</maven.compiler.target>
<javafx.version>16-ea+6</javafx.version> <javafx.version>16-ea+6</javafx.version>
<kotlin.version>1.4.21</kotlin.version> <kotlin.version>1.4.30</kotlin.version>
</properties> </properties>
@ -151,7 +180,7 @@
<dependency> <dependency>
<groupId>org.jline</groupId> <groupId>org.jline</groupId>
<artifactId>jline</artifactId> <artifactId>jline</artifactId>
<version>3.18.0</version> <version>3.19.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
@ -164,6 +193,11 @@
<version>${kotlin.version}</version> <version>${kotlin.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-runtime</artifactId>
<version>1.2.71</version>
</dependency>
<dependency> <dependency>
<groupId>com.github.Bixilon</groupId> <groupId>com.github.Bixilon</groupId>
<artifactId>ascii-table</artifactId> <artifactId>ascii-table</artifactId>

15
src/main/java/de/bixilon/minosoft/util/ChunkUtil.java
View File

@ -160,9 +160,18 @@ public final class ChunkUtil {
for (int nibbleZ = 0; nibbleZ < ProtocolDefinition.SECTION_WIDTH_Z; nibbleZ++) { for (int nibbleZ = 0; nibbleZ < ProtocolDefinition.SECTION_WIDTH_Z; nibbleZ++) {
for (int nibbleX = 0; nibbleX < ProtocolDefinition.SECTION_WIDTH_X; nibbleX++) { for (int nibbleX = 0; nibbleX < ProtocolDefinition.SECTION_WIDTH_X; nibbleX++) {
int blockNumber = (((nibbleY * ProtocolDefinition.SECTION_HEIGHT_Y) + nibbleZ) * ProtocolDefinition.SECTION_WIDTH_X) + nibbleX; int blockNumber = (((nibbleY * ProtocolDefinition.SECTION_HEIGHT_Y) + nibbleZ) * ProtocolDefinition.SECTION_WIDTH_X) + nibbleX;
int startLong = (blockNumber * palette.getBitsPerBlock()) / 64; int startLong;
int startOffset = (blockNumber * palette.getBitsPerBlock()) % 64; int startOffset;
int endLong = ((blockNumber + 1) * palette.getBitsPerBlock() - 1) / 64; int endLong;
if (buffer.getVersionId() < V_20W49A) { // ToDo: When did this changed? is just a guess
startLong = (blockNumber * palette.getBitsPerBlock()) / 64;
startOffset = (blockNumber * palette.getBitsPerBlock()) % 64;
endLong = ((blockNumber + 1) * palette.getBitsPerBlock() - 1) / 64;
} else {
startLong = endLong = blockNumber / (64 / palette.getBitsPerBlock());
startOffset = (blockNumber % (64 / palette.getBitsPerBlock())) * palette.getBitsPerBlock();
}
int blockId; int blockId;
if (startLong == endLong) { if (startLong == endLong) {