1.17: blocks, entities

README.md

@@ -6,6 +6,7 @@ A Bukkit server implementation utilizing Mixin.
 
 | Minecraft | Forge | Status | Build |
 | :----: | :----: | :---: | :---: |
+| 1.17.x | 37.0.1 | ACTIVE | - |
 | 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) |

arclight-common/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        maven { url = 'https://files.minecraftforge.net/maven' }
+        maven { url = 'https://maven.minecraftforge.net' }
         maven { url = 'https://repo.spongepowered.org/maven' }
         mavenCentral()
         maven { url = 'https://maven.izzel.io/releases' }
@@ -21,17 +21,17 @@ apply plugin: 'io.izzel.arclight'
 arclight {
     mcVersion = minecraftVersion
     forgeVersion = project.ext.forgeVersion
-    bukkitVersion = 'v1_16_R3'
+    bukkitVersion = 'v1_17_R1'
     wipeVersion = true
     reobfVersion = false
     accessTransformer = project.file('bukkit.at')
-    packageName = 'spigot'
+    // packageName = 'spigot'
 }
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
+// sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '11'
 
 minecraft {
-    mappings channel: 'snapshot', version: "20210215-1.16.3"
+    mappings channel: 'official', version: minecraftVersion
     accessTransformer = project.file('src/main/resources/META-INF/accesstransformer.cfg')
 }
 
@@ -48,13 +48,13 @@ 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.spongepowered:mixin:0.8.2'
     annotationProcessor 'org.spongepowered:mixin:0.8.2:processor'
-    
+
     implementation 'com.github.ArclightTeam:mixin-tools:1.0.0'
     annotationProcessor 'com.github.ArclightTeam:mixin-tools:1.0.0'
-    
+
     implementation 'jline:jline:2.12.1'
     implementation 'net.md-5:SpecialSource:1.9.0'
     implementation 'org.apache.logging.log4j:log4j-jul:2.11.2'
@@ -71,12 +71,6 @@ remapSpigotJar {
     includes.add('net/minecraft/tileentity/LecternTileEntity$LecternInventory')
 }
 
-processMapping {
-    process { csrg, srg ->
-        csrg.classes.put('net/minecraft/world/level/ColorResolver', "net/minecraft/server/$bukkitVersion/ColorResolver".toString())
-    }
-}
-
 generateArclightMeta {
     doFirst {
         throw new StopExecutionException()

arclight-common/src/main/java/io/izzel/arclight/common/bridge/block/BlockBridge.java

@@ -1,11 +1,11 @@
 package io.izzel.arclight.common.bridge.block;
 
-import net.minecraft.block.BlockState;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.server.ServerWorld;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.state.BlockState;
 
 public interface BlockBridge {
 
-    int bridge$getExpDrop(BlockState blockState, ServerWorld world, BlockPos blockPos, ItemStack itemStack);
+    int bridge$getExpDrop(BlockState blockState, ServerLevel world, BlockPos blockPos, ItemStack itemStack);
 }

arclight-common/src/main/java/io/izzel/arclight/common/bridge/block/FireBlockBridge.java

@@ -1,6 +1,6 @@
 package io.izzel.arclight.common.bridge.block;
 
-import net.minecraft.block.Block;
+import net.minecraft.world.level.block.Block;
 
 public interface FireBlockBridge {
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/block/NoteBlockBridge.java

@@ -1,10 +1,10 @@
 package io.izzel.arclight.common.bridge.block;
 
-import net.minecraft.block.BlockState;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.BlockState;
 
 public interface NoteBlockBridge {
 
-    void bridge$play(World worldIn, BlockPos pos, BlockState state);
+    void bridge$play(Level worldIn, BlockPos pos, BlockState state);
 }

arclight-common/src/main/java/io/izzel/arclight/common/bridge/block/PortalInfoBridge.java

@@ -1,6 +1,6 @@
 package io.izzel.arclight.common.bridge.block;
 
-import net.minecraft.world.server.ServerWorld;
+import net.minecraft.server.level.ServerLevel;
 import org.bukkit.craftbukkit.v.event.CraftPortalEvent;
 import org.jetbrains.annotations.Nullable;
 
@@ -10,7 +10,7 @@ public interface PortalInfoBridge {
 
     CraftPortalEvent bridge$getPortalEventInfo();
 
-    void bridge$setWorld(ServerWorld world);
+    void bridge$setWorld(ServerLevel world);
 
-    @Nullable ServerWorld bridge$getWorld();
+    @Nullable ServerLevel bridge$getWorld();
 }

arclight-common/src/main/java/io/izzel/arclight/common/bridge/bukkit/CraftItemStackBridge.java

@@ -1,6 +1,6 @@
 package io.izzel.arclight.common.bridge.bukkit;
 
-import net.minecraft.item.ItemStack;
+import net.minecraft.world.item.ItemStack;
 
 public interface CraftItemStackBridge {
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/bukkit/CraftServerBridge.java

@@ -1,11 +1,11 @@
 package io.izzel.arclight.common.bridge.bukkit;
 
-import net.minecraft.server.management.PlayerList;
-import net.minecraft.world.server.ServerWorld;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.players.PlayerList;
 
 public interface CraftServerBridge {
 
     void bridge$setPlayerList(PlayerList playerList);
 
-    void bridge$removeWorld(ServerWorld world);
+    void bridge$removeWorld(ServerLevel world);
 }

arclight-common/src/main/java/io/izzel/arclight/common/bridge/bukkit/EntityTypeBridge.java

@@ -1,12 +1,12 @@
 package io.izzel.arclight.common.bridge.bukkit;
 
 import io.izzel.arclight.i18n.conf.EntityPropertySpec;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityType;
-import net.minecraft.util.ResourceLocation;
 import org.bukkit.Location;
 
 import java.util.function.Function;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityType;
 
 public interface EntityTypeBridge {
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/bukkit/ItemMetaBridge.java

@@ -1,19 +1,18 @@
 package io.izzel.arclight.common.bridge.bukkit;
 
-import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.nbt.INBT;
-
 import java.util.Map;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.Tag;
 
 public interface ItemMetaBridge {
 
-    CompoundNBT bridge$getForgeCaps();
+    CompoundTag bridge$getForgeCaps();
 
-    void bridge$setForgeCaps(CompoundNBT nbt);
+    void bridge$setForgeCaps(CompoundTag nbt);
 
-    void bridge$offerUnhandledTags(CompoundNBT nbt);
+    void bridge$offerUnhandledTags(CompoundTag nbt);
 
-    Map<String, INBT> bridge$getUnhandledTags();
+    Map<String, Tag> bridge$getUnhandledTags();
 
-    void bridge$setUnhandledTags(Map<String, INBT> tags);
+    void bridge$setUnhandledTags(Map<String, Tag> tags);
 }

arclight-common/src/main/java/io/izzel/arclight/common/bridge/bukkit/MaterialBridge.java

@@ -1,15 +1,15 @@
 package io.izzel.arclight.common.bridge.bukkit;
 
 import io.izzel.arclight.i18n.conf.MaterialPropertySpec;
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import net.minecraft.util.ResourceLocation;
 import org.bukkit.block.BlockState;
 import org.bukkit.craftbukkit.v.block.CraftBlock;
 import org.bukkit.craftbukkit.v.inventory.CraftMetaItem;
 import org.bukkit.inventory.meta.ItemMeta;
 
 import javax.annotation.Nullable;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.Block;
 import java.util.function.Function;
 
 public interface MaterialBridge {

arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/ICommandSourceBridge.java

@@ -1,9 +1,9 @@
 package io.izzel.arclight.common.bridge.command;
 
-import net.minecraft.command.CommandSource;
+import net.minecraft.commands.CommandSourceStack;
 import org.bukkit.command.CommandSender;
 
 public interface ICommandSourceBridge {
 
-    CommandSender bridge$getBukkitSender(CommandSource wrapper);
+    CommandSender bridge$getBukkitSender(CommandSourceStack wrapper);
 }

arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/arguments/EntityArgumentBridge.java

@@ -2,7 +2,7 @@
 
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import net.minecraft.command.arguments.EntitySelector;
+import net.minecraft.commands.arguments.selector.EntitySelector;
 
 public interface EntityArgumentBridge {
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/command/arguments/EntitySelectorParserBridge.java

@@ -1,7 +1,7 @@
 package io.izzel.arclight.common.bridge.command.arguments;
 
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import net.minecraft.command.arguments.EntitySelector;
+import net.minecraft.commands.arguments.selector.EntitySelector;
 
 public interface EntitySelectorParserBridge {
 

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

@@ -1,17 +1,17 @@
 package io.izzel.arclight.common.bridge.entity;
 
 import io.izzel.arclight.common.bridge.command.ICommandSourceBridge;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.server.ServerWorld;
 import org.bukkit.craftbukkit.v.entity.CraftEntity;
 import org.bukkit.projectiles.ProjectileSource;
 
 import java.util.List;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.Entity;
 
 public interface EntityBridge extends ICommandSourceBridge {
 
-    Entity bridge$teleportTo(ServerWorld world, BlockPos blockPos);
+    Entity bridge$teleportTo(ServerLevel world, BlockPos blockPos);
 
     void bridge$setOnFire(int tick, boolean callEvent);
 

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

@@ -1,17 +1,17 @@
 package io.izzel.arclight.common.bridge.entity;
 
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.SpawnReason;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.world.server.ServerWorld;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 
 import javax.annotation.Nullable;
+import net.minecraft.core.BlockPos;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.MobSpawnType;
+import net.minecraft.world.entity.player.Player;
 
 public interface EntityTypeBridge<T extends Entity> {
 
-    T bridge$spawnCreature(ServerWorld worldIn, @Nullable CompoundNBT compound, @Nullable ITextComponent customName, @Nullable PlayerEntity playerIn, BlockPos pos, SpawnReason reason, boolean flag, boolean flag1, CreatureSpawnEvent.SpawnReason spawnReason);
+    T bridge$spawnCreature(ServerLevel worldIn, @Nullable CompoundTag compound, @Nullable Component customName, @Nullable Player playerIn, BlockPos pos, MobSpawnType reason, boolean flag, boolean flag1, CreatureSpawnEvent.SpawnReason spawnReason);
 }

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

@@ -1,6 +1,6 @@
 package io.izzel.arclight.common.bridge.entity;
 
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.core.BlockPos;
 import org.bukkit.craftbukkit.v.entity.CraftEntity;
 
 public interface InternalEntityBridge {

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

@@ -1,18 +1,18 @@
 package io.izzel.arclight.common.bridge.entity;
 
-import net.minecraft.inventory.EquipmentSlotType;
-import net.minecraft.item.ItemStack;
-import net.minecraft.potion.Effect;
-import net.minecraft.potion.EffectInstance;
 import org.bukkit.craftbukkit.v.entity.CraftLivingEntity;
 import org.bukkit.event.entity.EntityPotionEffectEvent;
 import org.bukkit.event.entity.EntityRegainHealthEvent;
 
 import java.util.Optional;
+import net.minecraft.world.effect.MobEffect;
+import net.minecraft.world.effect.MobEffectInstance;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.item.ItemStack;
 
 public interface LivingEntityBridge extends EntityBridge {
 
-    void bridge$setSlot(EquipmentSlotType slotIn, ItemStack stack, boolean silent);
+    void bridge$setSlot(EquipmentSlot slotIn, ItemStack stack, boolean silent);
 
     void bridge$playEquipSound(ItemStack stack, boolean silent);
 
@@ -32,9 +32,9 @@ public interface LivingEntityBridge extends EntityBridge {
 
     void bridge$pushEffectCause(EntityPotionEffectEvent.Cause cause);
 
-    boolean bridge$addEffect(EffectInstance effect, EntityPotionEffectEvent.Cause cause);
+    boolean bridge$addEffect(MobEffectInstance effect, EntityPotionEffectEvent.Cause cause);
 
-    boolean bridge$removeEffect(Effect effect, EntityPotionEffectEvent.Cause cause);
+    boolean bridge$removeEffect(MobEffect effect, EntityPotionEffectEvent.Cause cause);
 
     boolean bridge$removeAllEffects(EntityPotionEffectEvent.Cause cause);
 

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

@@ -1,8 +1,8 @@
 package io.izzel.arclight.common.bridge.entity;
 
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.entity.item.ItemEntity;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.item.ItemEntity;
 import org.bukkit.event.entity.EntityTargetEvent;
 import org.bukkit.event.entity.EntityTransformEvent;
 
@@ -25,9 +25,4 @@ public interface MobEntityBridge extends LivingEntityBridge {
     void bridge$setAware(boolean aware);
 
     void bridge$captureItemDrop(ItemEntity itemEntity);
-
-    interface Hack {
-
-        ResourceLocation getLootTable();
-    }
 }

arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/monster/EndermanEntityBridge.java

@@ -1,6 +1,6 @@
 package io.izzel.arclight.common.bridge.entity.monster;
 
-import net.minecraft.entity.LivingEntity;
+import net.minecraft.world.entity.LivingEntity;
 
 public interface EndermanEntityBridge {
 

arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/monster/piglin/PiglinBridge.java

@@ -0,0 +1,12 @@
+package io.izzel.arclight.common.bridge.entity.monster.piglin;
+
+import net.minecraft.world.item.Item;
+
+import java.util.Set;
+
+public interface PiglinBridge {
+
+    Set<Item> bridge$getAllowedBarterItems();
+
+    Set<Item> bridge$getInterestItems();
+}

arclight-common/src/main/java/io/izzel/arclight/common/bridge/entity/passive/AnimalEntityBridge.java

@@ -1,7 +1,7 @@
 package io.izzel.arclight.common.bridge.entity.passive;
 
-import net.minecraft.item.ItemStack;
 import io.izzel.arclight.common.bridge.entity.MobEntityBridge;
+import net.minecraft.world.item.ItemStack;
 
 public interface AnimalEntityBridge extends MobEntityBridge {