Initial update to 1.18

Not booting yet, required record related updates from modlauncher

.github/workflows/gradle.yml

@@ -18,10 +18,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 16
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: '16'
+        java-version: '17'
     - name: Cache Gradle User Files
       uses: actions/cache@v1
       with:

README.md

@@ -6,8 +6,8 @@ A Bukkit server implementation utilizing Mixin.
 
 | Minecraft | Forge | Status | Build |
 | :----: | :----: | :---: | :---: |
-| 1.18.x | 38.0.4 | - | - |
-| 1.17.x | 37.1.0 | LEGACY | [![1.17 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-17?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-17) |
+| 1.18.x | 38.0.12 | ACTIVE | [![1.18 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-18?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-18) |
+| 1.17.x | 37.1.0 | [LEGACY](https://github.com/IzzelAliz/Arclight/releases/tag/1.17/1.0.1) | [![1.17 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-17?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-17) |
 | 1.16.x | 36.2.0 | ACTIVE | [![1.16 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-16?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-16) |
 | 1.15.x | 31.2.48 | [LEGACY](https://github.com/IzzelAliz/Arclight/releases/tag/1.15/1.0.19) | [![1.15 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-15?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-15) |
 | 1.14.x | 28.2.0 | [LEGACY](https://github.com/IzzelAliz/Arclight/releases/tag/1.0.6) | [![1.14 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight) |

appveyor-17.yml → appveyor-18.yml

@@ -1,9 +1,9 @@
 version: '{branch}-{build}'
 image:
-  - 'Visual Studio 2019'
+  - 'Visual Studio 2022'
 branches:
   only:
-    - 1.17
+    - 1.18
 environment:
   JAVA_HOME: C:\Program Files\Java\jdk16
 cache:

arclight-common/build.gradle

@@ -24,7 +24,7 @@ apply plugin: 'io.izzel.arclight'
 arclight {
     mcVersion = minecraftVersion
     forgeVersion = project.ext.forgeVersion
-    bukkitVersion = 'v1_17_R1'
+    bukkitVersion = 'v1_18_R1'
     wipeVersion = true
     reobfVersion = true
     accessTransformer = project.file('bukkit.at')
@@ -35,10 +35,11 @@ configurations {
     embed
 }
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(16)
+java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
 minecraft {
-    mappings channel: 'parchment', version: "2021.08.22-$minecraftVersion"
+    //mappings channel: 'parchment', version: "2021.08.22-$minecraftVersion"
+    mappings channel: 'official', version: '1.18'
     accessTransformer = project.file('src/main/resources/META-INF/accesstransformer.cfg')
 }
 
@@ -54,7 +55,7 @@ repositories {
 dependencies {
     minecraft "net.minecraftforge:forge:$minecraftVersion-$forgeVersion"
     implementation "org.spigotmc:spigot-api:$minecraftVersion-R0.1-SNAPSHOT@jar"
-    implementation 'org.jetbrains:annotations:19.0.0'
+    implementation 'org.jetbrains:annotations:22.0.0'
 
     implementation "org.spongepowered:mixin:$mixinVersion"
     annotationProcessor 'org.spongepowered:mixin:0.8.3:processor'

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/AreaEffectCloudEntityBridge.java

@@ -3,11 +3,4 @@
 public interface AreaEffectCloudEntityBridge {
 
     void bridge$refreshEffects();
-
-    interface Hack {
-
-        String getType();
-
-        void setType(final String string);
-    }
 }

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/projectile/ArrowEntityBridge.java

@@ -7,11 +7,4 @@ public interface ArrowEntityBridge extends EntityBridge {
     void bridge$refreshEffects();
 
     boolean bridge$isTipped();
-
-    interface Hack {
-
-        String getType();
-
-        void setType(final String string);
-    }
 }

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/TeleporterBridge.java

@@ -1,14 +1,16 @@
 package io.izzel.arclight.common.bridge.core.world;
 
-import java.util.Optional;
 import net.minecraft.BlockUtil;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.border.WorldBorder;
+
+import java.util.Optional;
 
 public interface TeleporterBridge {
 
-    Optional<BlockUtil.FoundRectangle> bridge$findPortal(BlockPos pos, int searchRadius);
+    Optional<BlockUtil.FoundRectangle> bridge$findPortal(BlockPos pos, WorldBorder worldborder, int searchRadius);
 
     Optional<BlockUtil.FoundRectangle> bridge$createPortal(BlockPos pos, Direction.Axis axis, Entity entity, int createRadius);
 }

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/WorldBridge.java

@@ -3,7 +3,7 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.world.level.dimension.LevelStem;
 import org.bukkit.craftbukkit.v.CraftServer;
 import org.bukkit.craftbukkit.v.CraftWorld;
 import org.bukkit.generator.ChunkGenerator;
@@ -41,5 +41,5 @@ public interface WorldBridge extends IWorldWriterBridge, IWorldBridge {
 
     long bridge$ticksPerWaterUndergroundSpawns();
 
-    ResourceKey<DimensionType> bridge$getTypeKey();
+    ResourceKey<LevelStem> bridge$getTypeKey();
 }

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/chunk/ChunkAccessBridge.java

@@ -0,0 +1,8 @@
+package io.izzel.arclight.common.bridge.core.world.chunk;
+
+import org.bukkit.persistence.PersistentDataContainer;
+
+public interface ChunkAccessBridge {
+
+    PersistentDataContainer bridge$getPersistentDataContainer();
+}

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/chunk/LevelChunkSectionBridge.java

@@ -0,0 +1,8 @@
+package io.izzel.arclight.common.bridge.core.world.chunk;
+
+import net.minecraft.world.level.biome.Biome;
+
+public interface LevelChunkSectionBridge {
+
+    void bridge$setBiome(int x, int y, int z, Biome biome);
+}

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/level/levelgen/ChunkGeneratorBridge.java

@@ -1,7 +1,6 @@
 package io.izzel.arclight.common.bridge.core.world.level.levelgen;
 
 import net.minecraft.server.level.WorldGenRegion;
-import net.minecraft.world.level.StructureFeatureManager;
 import net.minecraft.world.level.biome.BiomeSource;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.levelgen.WorldgenRandom;
@@ -10,8 +9,6 @@
 
 public interface ChunkGeneratorBridge {
 
-    void bridge$addDecorations(WorldGenRegion region, StructureFeatureManager structureManager, boolean vanilla);
-
     void bridge$buildBedrock(ChunkAccess chunkAccess, Random random);
 
     WorldgenRandom bridge$buildSurface(WorldGenRegion region, ChunkAccess chunkAccess);

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/server/ChunkMapBridge.java

@@ -13,8 +13,6 @@ public interface ChunkMapBridge {
 
     Iterable<ChunkHolder> bridge$getLoadedChunksIterable();
 
-    boolean bridge$isOutsideSpawningRadius(ChunkPos chunkPosIn);
-
     void bridge$tickEntityTracker();
 
     ArclightCallbackExecutor bridge$getCallbackExecutor();

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/spawner/WorldEntitySpawnerBridge.java

@@ -4,6 +4,7 @@
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.Mob;
 import net.minecraft.world.entity.MobCategory;
+import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.ChunkAccess;
 
 public interface WorldEntitySpawnerBridge {
@@ -12,7 +13,7 @@ interface EntityDensityManagerBridge {
 
         void bridge$updateDensity(Mob mobEntity, ChunkAccess chunk);
 
-        boolean bridge$canSpawn(MobCategory classification, int limit);
+        boolean bridge$canSpawn(MobCategory classification, ChunkPos pos, int limit);
 
         boolean bridge$canSpawn(EntityType<?> entityType, BlockPos pos, ChunkAccess chunk);
     }

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/storage/DerivedWorldInfoBridge.java

@@ -1,12 +1,12 @@
 package io.izzel.arclight.common.bridge.core.world.storage;
 
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.world.level.dimension.DimensionType;
+import net.minecraft.world.level.dimension.LevelStem;
 import net.minecraft.world.level.storage.ServerLevelData;
 
 public interface DerivedWorldInfoBridge {
 
     ServerLevelData bridge$getDelegate();
 
-    void bridge$setDimType(ResourceKey<DimensionType> typeKey);
+    void bridge$setDimType(ResourceKey<LevelStem> typeKey);
 }

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/storage/SaveFormatBridge.java → arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/world/storage/LevelStorageSourceBridge.java

@@ -1,16 +1,19 @@
 package io.izzel.arclight.common.bridge.core.world.storage;
 
-import java.io.IOException;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.level.dimension.LevelStem;
 import net.minecraft.world.level.storage.LevelStorageSource;
 
-public interface SaveFormatBridge {
+import java.io.IOException;
+
+public interface LevelStorageSourceBridge {
 
     LevelStorageSource.LevelStorageAccess bridge$getLevelSave(String saveName, ResourceKey<LevelStem> world) throws IOException;
 
-    interface LevelSaveBridge {
+    interface LevelStorageAccessBridge {
 
         void bridge$setDimType(ResourceKey<LevelStem> typeKey);
+
+        ResourceKey<LevelStem> bridge$getTypeKey();
     }
 }

arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftWorldMixin.java

@@ -23,6 +23,6 @@ public abstract class CraftWorldMixin {
      */
     @Overwrite
     public File getWorldFolder() {
-        return ((ServerWorldBridge) this.world).bridge$getConvertable().getDimensionPath(this.world.dimension());
+        return ((ServerWorldBridge) this.world).bridge$getConvertable().getDimensionPath(this.world.dimension()).toFile();
     }
 }

arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/LibraryLoaderMixin.java

@@ -12,7 +12,7 @@
 public class LibraryLoaderMixin {
 
     @Redirect(method = "createLoader", at = @At(value = "NEW", target = "java/net/URLClassLoader"))
-    private URLClassLoader arclight$useRemapped(URL[] urls) {
-        return new RemappingURLClassLoader(urls);
+    private URLClassLoader arclight$useRemapped(URL[] urls, ClassLoader loader) {
+        return new RemappingURLClassLoader(urls, loader);
     }
 }

arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/commands/CommandsMixin.java

@@ -41,7 +41,7 @@ public abstract class CommandsMixin {
         this.dispatcher.setConsumer((context, b, i) -> context.getSource().onCommandComplete(context, b, i));
     }
 
-    public int a(CommandSourceStack source, String command, String label, boolean strip) {
+    public int performCommand(CommandSourceStack source, String command, String label, boolean strip) {
         return this.performCommand(source, command);
     }
 

arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerHandshakeNetHandlerMixin.java

@@ -16,7 +16,7 @@
 import net.minecraft.server.network.ServerHandshakePacketListenerImpl;
 import net.minecraft.server.network.ServerLoginPacketListenerImpl;
 import net.minecraft.server.network.ServerStatusPacketListenerImpl;
-import net.minecraftforge.fmllegacy.server.ServerLifecycleHooks;
+import net.minecraftforge.server.ServerLifecycleHooks;
 import org.apache.logging.log4j.LogManager;
 import org.bukkit.Bukkit;
 import org.spigotmc.SpigotConfig;