Upstream/ViaRewind-Legacy-Support
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaRewind-Legacy-Support.git synced 2024-11-14 10:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add Java 16 support (#22)

Browse Source 
* Add Java 16 support

* Fix order in VoxelShapeArray
This commit is contained in:
MrMicky 2021-07-06 21:14:59 +02:00 committed by GitHub
parent cf7d992222
commit a782c6aac3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 63 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@ -30,19 +30,11 @@
</repositories>
<dependencies>
<!-- Lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.20</version>
<scope>provided</scope>
</dependency>
<!-- ViaVersion -->
<dependency>
<groupId>com.viaversion</groupId>
<artifactId>viaversion-api</artifactId>
<version>4.0.0-1.17-rc2-SNAPSHOT</version>
<version>4.0.0</version>
<scope>provided</scope>
</dependency>

87
src/main/java/de/gerrygames/viarewind/legacysupport/injector/BoundingBoxFixer.java
View File

@ -1,29 +1,31 @@
package de.gerrygames.viarewind.legacysupport.injector;
import com.viaversion.viaversion.api.Via;
import de.gerrygames.viarewind.legacysupport.BukkitPlugin;
import de.gerrygames.viarewind.legacysupport.reflection.ReflectionAPI;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.logging.Level;
public class BoundingBoxFixer {
public static void fixLilyPad() {
try {
Class blockWaterLilyClass = NMSReflection.getNMSClass("BlockWaterLily");
Class<?> blockWaterLilyClass = NMSReflection.getNMSClass("BlockWaterLily");
Field boundingBoxField = ReflectionAPI.getFieldAccessible(blockWaterLilyClass, "a");
setBoundingBox(boundingBoxField, 0.0625, 0.0, 0.0625, 0.9375, 0.015625, 0.9375);
Object boundingBox = boundingBoxField.get(null);
setBoundingBox(boundingBox, 0.0625, 0.0, 0.0625, 0.9375, 0.015625, 0.9375);
} catch (Exception ex) {
System.out.println("Could not fix lily pad bounding box.");
ex.printStackTrace();
BukkitPlugin.getInstance().getLogger().log(Level.SEVERE, "Could not fix lily pad bounding box.", ex);
}
}
public static void fixLadder() {
try {
Class blockLadderClass = NMSReflection.getNMSClass("BlockLadder");
Class<?> blockLadderClass = NMSReflection.getNMSClass("BlockLadder");
Field boundingBoxNorthField, boundingBoxSouthField, boundingBoxWestField, boundingBoxEastField;
@ -45,28 +47,63 @@ public class BoundingBoxFixer {
boundingBoxNorthField = ReflectionAPI.getFieldAccessible(blockLadderClass, "f");
}
setBoundingBox(boundingBoxEastField, 0.0D, 0.0D, 0.0D, 0.125D, 1.0D, 1.0D);
setBoundingBox(boundingBoxWestField, 0.875D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D);
setBoundingBox(boundingBoxSouthField, 0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 0.125D);
setBoundingBox(boundingBoxNorthField, 0.0D, 0.0D, 0.875D, 1.0D, 1.0D, 1.0D);
setBoundingBox(boundingBoxEastField.get(null), 0.0D, 0.0D, 0.0D, 0.125D, 1.0D, 1.0D);
setBoundingBox(boundingBoxWestField.get(null), 0.875D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D);
setBoundingBox(boundingBoxSouthField.get(null), 0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 0.125D);
setBoundingBox(boundingBoxNorthField.get(null), 0.0D, 0.0D, 0.875D, 1.0D, 1.0D, 1.0D);
} catch (Exception ex) {
System.out.println("Could not fix ladder bounding box.");
ex.printStackTrace();
BukkitPlugin.getInstance().getLogger().log(Level.SEVERE, "Could not fix ladder bounding box.", ex);
}
}
private static void setBoundingBox(Field field, double x1, double y1, double z1, double x2, double y2, double z2) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException {
if (field.getType().getSimpleName().equals("AxisAlignedBB")) {
Class boundingBoxClass = field.getType();
Constructor boundingBoxConstructor = boundingBoxClass.getConstructor(double.class, double.class, double.class, double.class, double.class, double.class);
Object boundingBox = boundingBoxConstructor.newInstance(x1, y1, z1, x2, y2, z2);
ReflectionAPI.setFinalValue(field, boundingBox);
} else if (field.getType().getSimpleName().equals("VoxelShape")) {
Method createVoxelShape = ReflectionAPI.getMethod(NMSReflection.getNMSClass("VoxelShapes"), "create", double.class, double.class, double.class, double.class, double.class, double.class);
Object boundingBox = ReflectionAPI.invokeMethod(createVoxelShape, x1, y1, z1, x2, y2, z2);
ReflectionAPI.setFinalValue(field, boundingBox);
} else {
throw new IllegalStateException();
private static void setBoundingBox(Object boundingBox, double... values) throws ReflectiveOperationException {
if (boundingBox.getClass().getSimpleName().equals("VoxelShapeArray")) {
setVoxelShapeArray(boundingBox, values);
return;
}
if (boundingBox.getClass().getSimpleName().equals("AxisAlignedBB")) {
setAxisAlignedBB(boundingBox, values);
return;
}
throw new IllegalStateException("Unknown bounding box type: " + boundingBox.getClass().getName());
}
private static void setAxisAlignedBB(Object boundingBox, double[] values) throws ReflectiveOperationException {
Field[] doubleFields = Arrays.stream(boundingBox.getClass().getDeclaredFields())
.filter(f -> f.getType() == double.class)
.toArray(Field[]::new);
if (doubleFields.length < 6) {
throw new IllegalStateException("Invalid field count for " + boundingBox.getClass().getName() + ": " + doubleFields.length);
}
for (int i = 0; i < 6; i++) {
Field currentField = doubleFields[i];
currentField.setAccessible(true);
currentField.setDouble(boundingBox, values[i]);
}
}
private static void setVoxelShapeArray(Object voxelShapeArray, double[] values) throws ReflectiveOperationException {
Field[] doubleListFields = Arrays.stream(voxelShapeArray.getClass().getDeclaredFields())
.filter(f -> f.getType().getSimpleName().equals("DoubleList"))
.toArray(Field[]::new);
if (doubleListFields.length < 3) {
throw new IllegalStateException("Invalid field count for " + voxelShapeArray.getClass().getName() + ": " + doubleListFields.length);
}
// fastutil is relocated on Spigot but not on Paper
String doubleArrayListClass = doubleListFields[0].getType().getName().replace("DoubleList", "DoubleArrayList");
Method wrapMethod = Class.forName(doubleArrayListClass).getMethod("wrap", double[].class);
for (int i = 0; i < 3; i++) {
double[] array = {values[i], values[i + 3]};
Field field = doubleListFields[i];
field.setAccessible(true);
field.set(voxelShapeArray, wrapMethod.invoke(null, (Object) array));
}
}
}