Skip to content

Commit

Permalink
Merge the beta version into the mainline
Browse files Browse the repository at this point in the history
  • Loading branch information
404Setup committed Sep 7, 2024
1 parent 6798e7a commit 002fa6a
Show file tree
Hide file tree
Showing 118 changed files with 11,250 additions and 887 deletions.
61 changes: 56 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,62 @@
<br /><br />
</div>

**The September test is about to end and merge everything to the main line. **
<center>
<p>
<a href="https://tranic.one/software/vine">HomePage</a> |
<a href="#download" >Download</a> |
<a href="https://github.com/LevelTranic/Vine/issues">Issues</a> |
<a href="https://docs.tranic.one/vine">Docs</a> |
<a href="https://discord.gg/dBbSbv2Vuz">Discord</a>
</p>
</center>

**The main line is about to restore normal updates.**
---
> **It is still unstable at present, please choose carefully.**
>
> ----
>
> What is certain is that Vine will not launch any proprietary API.
> You should use FoliaAPI or MultiLib to develop plugins.
>
> ShreddedPaper/Vine is completely different from Folia. Players'
> operations will still have a certain impact on other players,
> instead of the areas in Folia being completely unrelated
> (most of the time).
---

[READ IN OUR PAGE!!!](https://docs.tranic.one/vine)
## What is Vine?
<p>Vine is a general multithreaded Minecraft server that is not specifically designed for one type of gameplay, as that would just cause more trouble. So, just do what you need to do and focus on optimizations, fixes, and features that don’t affect the game mechanics.</p>
<p>Vine was named after a friend of mine, which of course was nothing special, just because I didn't know what to name it.</p>
<br />

## Contact Us
Discord: https://discord.gg/dBbSbv2Vuz
## Feature
- Sub-regional multi-threading introduced by ShreddedPaper can better withstand a large number of dense players.
- Builtin and the latest Kotlin dependency library.
- Various performance optimization.
- Implement secure seeds to avoid cracking.
- Implemented SectorFile and Linear region formats to save a lot of storage space.
- Expanded options allow restoring more vanilla abilities.
- And some fixes from various places.
<br />

## Download
### Confirmable downloads
<p><a target="_blank" href="https://tranic.one/downloads/vine">Click To Download</a></p>

### Experimental Builds
<p><a target="_blank" href="https://github.com/LevelTranic/Vine/actions">Click To Download</a></p>

## Building

### Required
- Git
- Java (Minimum 21)
- Internet connection

### Steps
```Bash
git clone https://github.com/LevelTranic/Vine
cd Vine
./gradlew applyPatches && ./gradlew createMojmapBundlerJar
```
71 changes: 71 additions & 0 deletions patches/api/0003-Remove-deprecation-flags-in-SIMD.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: 404Setup <153366651+404Setup@users.noreply.github.com>
Date: Mon, 2 Sep 2024 08:45:02 +0800
Subject: [PATCH] Remove deprecation flags in SIMD


diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
index 7024a47b0de5083c3ba49c8e45b4c4b1369ab2c5..6b371d2f16c6abc8a20b7d762242f2ceeafe754d 100644
--- a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
+++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
@@ -9,10 +9,8 @@ import jdk.incubator.vector.VectorSpecies;
/**
* Basically, java is annoying and we have to push this out to its own class.
*/
-@Deprecated
public class SIMDChecker {
-
- @Deprecated
+
public static boolean canEnable(Logger logger) {
try {
if (SIMDDetection.getJavaVersion() < 17) {
diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java
index a84889d3e9cfc4d7ab5f867820a6484c6070711b..99d24fb74de68a9b7c656ca59dc51712926c089e 100644
--- a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java
+++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java
@@ -2,14 +2,12 @@ package gg.pufferfish.pufferfish.simd;

import java.util.logging.Logger;

-@Deprecated
public class SIMDDetection {

public static boolean isEnabled = false;
public static boolean versionLimited = false;
public static boolean testRun = false;
-
- @Deprecated
+
public static boolean canEnable(Logger logger) {
try {
return SIMDChecker.canEnable(logger);
@@ -17,8 +15,7 @@ public class SIMDDetection {
return false;
}
}
-
- @Deprecated
+
public static int getJavaVersion() {
// https://stackoverflow.com/a/2591122
String version = System.getProperty("java.version");
diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/VectorMapPalette.java b/src/main/java/gg/pufferfish/pufferfish/simd/VectorMapPalette.java
index ae2464920c9412ac90b819a540ee58be0741465f..b3d87875facc3e2981646a39b68afb3eb2659e86 100644
--- a/src/main/java/gg/pufferfish/pufferfish/simd/VectorMapPalette.java
+++ b/src/main/java/gg/pufferfish/pufferfish/simd/VectorMapPalette.java
@@ -7,13 +7,11 @@ import jdk.incubator.vector.VectorMask;
import jdk.incubator.vector.VectorSpecies;
import org.bukkit.map.MapPalette;

-@Deprecated
public class VectorMapPalette {

private static final VectorSpecies<Integer> I_SPEC = IntVector.SPECIES_PREFERRED;
private static final VectorSpecies<Float> F_SPEC = FloatVector.SPECIES_PREFERRED;
-
- @Deprecated
+
public static void matchColorVectorized(int[] in, byte[] out) {
int speciesLength = I_SPEC.length();
int i;
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Kotlin api


diff --git a/build.gradle.kts b/build.gradle.kts
index ab1116a3abbce6c3c5a6fb484a00530291fd0153..6e3daea37891143240f6e6fe785a84f19d9d57eb 100644
index ab1116a3abbce6c3c5a6fb484a00530291fd0153..766394287ca6e6ca3a0d4908e32e8025e6d16463 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -58,6 +58,15 @@ dependencies {
Expand Down
125 changes: 0 additions & 125 deletions patches/api/0004-Vine-Config.patch

This file was deleted.

Loading

0 comments on commit 002fa6a

Please sign in to comment.