Port to upstream changes (hopefully)

Author: FlorianMichael

README.md

@@ -37,6 +37,8 @@ Building
 After cloning this repository, build the project with Gradle by running `./gradlew build` and take the created jar out
 of the `universal/build/libs` directory.
 
+You need JDK 17 or newer to build ViaRewind.
+
 License
 -
 This project is licensed under the [GNU General Public License Version 3](LICENSE).

buildSrc/src/main/groovy/com.viaversion.java-conventions.gradle

@@ -47,7 +47,7 @@ base {
     description = "ViaBackwards addon to allow 1.8.x and 1.7.x clients on newer server versions."
 }
 
-java.sourceCompatibility = JavaVersion.VERSION_1_8
+java.sourceCompatibility = JavaVersion.VERSION_17
 
 tasks {
     // Variable replacements

common/src/main/java/com/viaversion/viarewind/ViaRewindConfig.java

@@ -25,6 +25,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.logging.Logger;
 
 public class ViaRewindConfig extends Config implements com.viaversion.viarewind.api.ViaRewindConfig {
 
@@ -39,8 +40,8 @@ public class ViaRewindConfig extends Config implements com.viaversion.viarewind.
 	private boolean enableOffhand;
 	private String offhandCommand;
 
-    public ViaRewindConfig(File configFile) {
-        super(configFile);
+    public ViaRewindConfig(File configFile, Logger logger) {
+        super(configFile, logger);
     }
 
 	@Override

common/src/main/java/com/viaversion/viarewind/api/ViaRewindPlatform.java

@@ -41,7 +41,7 @@ public interface ViaRewindPlatform {
 	 * Initialize ViaRewind
 	 */
 	default void init(final File configFile) {
-		ViaRewindConfig config = new ViaRewindConfig(configFile);
+		ViaRewindConfig config = new ViaRewindConfig(configFile, getLogger());
 		config.reload();
 		Via.getManager().getConfigurationProvider().register(config);
 

…n/viarewind/api/data/RewindMappings.java …iarewind/api/data/RewindMappingData.javacommon/src/main/java/com/viaversion/viarewind/api/data/RewindMappings.java renamed to common/src/main/java/com/viaversion/viarewind/api/data/RewindMappingData.java common/src/main/java/com/viaversion/viarewind/api/data/RewindMappings.java renamed to common/src/main/java/com/viaversion/viarewind/api/data/RewindMappingData.java

@@ -17,15 +17,15 @@
  */
 package com.viaversion.viarewind.api.data;
 
-import com.viaversion.viabackwards.api.data.BackwardsMappings;
+import com.viaversion.viabackwards.api.data.BackwardsMappingData;
 import com.viaversion.viarewind.ViaRewind;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
+import com.viaversion.nbt.tag.CompoundTag;
 
 import java.util.logging.Logger;
 
-public class RewindMappings extends BackwardsMappings {
+public class RewindMappingData extends BackwardsMappingData {
 
-	public RewindMappings(String unmappedVersion, String mappedVersion) {
+	public RewindMappingData(String unmappedVersion, String mappedVersion) {
 		super(unmappedVersion, mappedVersion);
 	}
 
@@ -36,6 +36,6 @@ protected Logger getLogger() {
 
 	@Override
 	protected CompoundTag readMappingsFile(String name) {
-		return VRMappingDataLoader.INSTANCE.loadNBTFromDir(name);
+		return RewindMappingDataLoader.INSTANCE.loadNBTFromDir(name);
 	}
 }

…rewind/api/data/VRMappingDataLoader.java …nd/api/data/RewindMappingDataLoader.javacommon/src/main/java/com/viaversion/viarewind/api/data/VRMappingDataLoader.java renamed to common/src/main/java/com/viaversion/viarewind/api/data/RewindMappingDataLoader.java common/src/main/java/com/viaversion/viarewind/api/data/VRMappingDataLoader.java renamed to common/src/main/java/com/viaversion/viarewind/api/data/RewindMappingDataLoader.java

@@ -23,12 +23,12 @@
 import java.io.File;
 import java.util.logging.Logger;
 
-public class VRMappingDataLoader extends BackwardsMappingDataLoader {
+public class RewindMappingDataLoader extends BackwardsMappingDataLoader {
 
-	public static final VRMappingDataLoader INSTANCE = new VRMappingDataLoader();
+	public static final RewindMappingDataLoader INSTANCE = new RewindMappingDataLoader();
 
-	public VRMappingDataLoader() {
-		super(VRMappingDataLoader.class, "assets/viarewind/data/");
+	public RewindMappingDataLoader() {
+		super(RewindMappingDataLoader.class, "assets/viarewind/data/");
 	}
 
 

…iarewind/utils/ExtendedBlockStorage.java …/api/minecraft/ExtendedBlockStorage.javacommon/src/main/java/com/viaversion/viarewind/utils/ExtendedBlockStorage.java renamed to common/src/main/java/com/viaversion/viarewind/api/minecraft/ExtendedBlockStorage.java common/src/main/java/com/viaversion/viarewind/utils/ExtendedBlockStorage.java renamed to common/src/main/java/com/viaversion/viarewind/api/minecraft/ExtendedBlockStorage.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.viarewind.utils;
+package com.viaversion.viarewind.api.minecraft;
 
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
 import com.viaversion.viaversion.api.minecraft.chunks.NibbleArray;

…/api/type/metadata/MetaType1_7_6_10.java …/entitydata/EntityDataTypes1_7_6_10.javacommon/src/main/java/com/viaversion/viarewind/api/type/metadata/MetaType1_7_6_10.java renamed to common/src/main/java/com/viaversion/viarewind/api/minecraft/entitydata/EntityDataTypes1_7_6_10.java common/src/main/java/com/viaversion/viarewind/api/type/metadata/MetaType1_7_6_10.java renamed to common/src/main/java/com/viaversion/viarewind/api/minecraft/entitydata/EntityDataTypes1_7_6_10.java

@@ -15,30 +15,31 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.viarewind.api.type.metadata;
+package com.viaversion.viarewind.api.minecraft.entitydata;
 
-import com.viaversion.viarewind.api.type.Types1_7_6_10;
-import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
+import com.viaversion.viarewind.api.type.RewindTypes;
+import com.viaversion.viaversion.api.minecraft.entitydata.EntityDataType;
 import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.Types;
 
-public enum MetaType1_7_6_10 implements MetaType {
-	Byte(0, Type.BYTE),
-	Short(1, Type.SHORT),
-	Int(2, Type.INT),
-	Float(3, Type.FLOAT),
-	String(4, Type.STRING),
-	Slot(5, Types1_7_6_10.COMPRESSED_NBT_ITEM),
-	Position(6, Type.VECTOR);
+public enum EntityDataTypes1_7_6_10 implements EntityDataType {
+	BYTE(0, Types.BYTE),
+	SHORT(1, Types.SHORT),
+	INT(2, Types.INT),
+	FLOAT(3, Types.FLOAT),
+	STRING(4, Types.STRING),
+	ITEM(5, RewindTypes.COMPRESSED_NBT_ITEM),
+	POSITION(6, Types.VECTOR);
 
 	private final int typeID;
 	private final Type<?> type;
 
-	MetaType1_7_6_10(int typeID, Type<?> type) {
+	EntityDataTypes1_7_6_10(int typeID, Type<?> type) {
 		this.typeID = typeID;
 		this.type = type;
 	}
 
-	public static MetaType1_7_6_10 byId(int id) {
+	public static EntityDataTypes1_7_6_10 byId(int id) {
 		return values()[id];
 	}
 

…iaversion/viarewind/utils/math/AABB.java …n/viarewind/api/minecraft/math/AABB.javacommon/src/main/java/com/viaversion/viarewind/utils/math/AABB.java renamed to common/src/main/java/com/viaversion/viarewind/api/minecraft/math/AABB.java common/src/main/java/com/viaversion/viarewind/utils/math/AABB.java renamed to common/src/main/java/com/viaversion/viarewind/api/minecraft/math/AABB.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.viarewind.utils.math;
+package com.viaversion.viarewind.api.minecraft.math;
 
 public class AABB {
 	Vector3d min;

…aversion/viarewind/utils/math/Ray3d.java …/viarewind/api/minecraft/math/Ray3d.javacommon/src/main/java/com/viaversion/viarewind/utils/math/Ray3d.java renamed to common/src/main/java/com/viaversion/viarewind/api/minecraft/math/Ray3d.java common/src/main/java/com/viaversion/viarewind/utils/math/Ray3d.java renamed to common/src/main/java/com/viaversion/viarewind/api/minecraft/math/Ray3d.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.viaversion.viarewind.utils.math;
+package com.viaversion.viarewind.api.minecraft.math;
 
 public class Ray3d {
 	Vector3d start;