update #21
|
@ -33,7 +33,7 @@ loom {
|
||||||
inherit server
|
inherit server
|
||||||
name "Data Generation"
|
name "Data Generation"
|
||||||
vmArg "-Dfabric-api.datagen"
|
vmArg "-Dfabric-api.datagen"
|
||||||
vmArg "-Dfabric-api.datagen.output-dir=${file("src/main/generated")}"
|
vmArg "-Dfabric-api.datagen.output-dir=${file("src/main/java")}"
|
||||||
vmArg "-Dfabric-api.datagen.modid=reservermod"
|
vmArg "-Dfabric-api.datagen.modid=reservermod"
|
||||||
|
|
||||||
runDir "build/datagen"
|
runDir "build/datagen"
|
||||||
|
@ -46,7 +46,7 @@ sourceSets {
|
||||||
main {
|
main {
|
||||||
resources {
|
resources {
|
||||||
srcDirs += [
|
srcDirs += [
|
||||||
'src/main/generated'
|
'src/main/java'
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,6 @@ package modchestClient.networking;
|
||||||
import modchest.REServerMod;
|
import modchest.REServerMod;
|
||||||
import modchestClient.networking.packet.respawnRequestS2CPacket;
|
import modchestClient.networking.packet.respawnRequestS2CPacket;
|
||||||
import modchestClient.networking.payload.requestRespawn;
|
import modchestClient.networking.payload.requestRespawn;
|
||||||
import modchestClient.networking.payload.startSleepingCallButtons;
|
|
||||||
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
|
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
|
||||||
import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
|
import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
|
||||||
import net.minecraft.util.Identifier;
|
import net.minecraft.util.Identifier;
|
||||||
|
|
|
@ -9,12 +9,7 @@ import net.minecraft.block.BlockWithEntity;
|
||||||
import net.minecraft.block.entity.BlockEntity;
|
import net.minecraft.block.entity.BlockEntity;
|
||||||
import net.minecraft.block.entity.BlockEntityTicker;
|
import net.minecraft.block.entity.BlockEntityTicker;
|
||||||
import net.minecraft.block.entity.BlockEntityType;
|
import net.minecraft.block.entity.BlockEntityType;
|
||||||
import net.minecraft.entity.player.PlayerEntity;
|
|
||||||
import net.minecraft.screen.NamedScreenHandlerFactory;
|
|
||||||
import net.minecraft.util.ActionResult;
|
|
||||||
import net.minecraft.util.Hand;
|
|
||||||
import net.minecraft.util.ItemScatterer;
|
import net.minecraft.util.ItemScatterer;
|
||||||
import net.minecraft.util.hit.BlockHitResult;
|
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
|
@ -4,8 +4,6 @@ import modchest.REServerMod;
|
||||||
import modchest.util.setAndGetMultiButtonsSpawn;
|
import modchest.util.setAndGetMultiButtonsSpawn;
|
||||||
import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents;
|
import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents;
|
||||||
import net.minecraft.nbt.NbtCompound;
|
import net.minecraft.nbt.NbtCompound;
|
||||||
import net.minecraft.registry.Registries;
|
|
||||||
import net.minecraft.registry.Registry;
|
|
||||||
import net.minecraft.registry.RegistryKey;
|
import net.minecraft.registry.RegistryKey;
|
||||||
import net.minecraft.registry.RegistryKeys;
|
import net.minecraft.registry.RegistryKeys;
|
||||||
import net.minecraft.server.network.ServerPlayerEntity;
|
import net.minecraft.server.network.ServerPlayerEntity;
|
||||||
|
|
|
@ -10,8 +10,6 @@ import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
|
|
||||||
@Mixin(ServerPlayerEntity.class)
|
@Mixin(ServerPlayerEntity.class)
|
||||||
public abstract class ServerPlayerEntityMixin implements ServerPlayerEntityInterface {
|
public abstract class ServerPlayerEntityMixin implements ServerPlayerEntityInterface {
|
||||||
@Unique
|
@Unique
|
||||||
|
|
|
@ -5,17 +5,14 @@ import modchest.util.setAndGetMultiButtonsSpawn;
|
||||||
import net.minecraft.block.BlockState;
|
import net.minecraft.block.BlockState;
|
||||||
import net.minecraft.entity.player.PlayerEntity;
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
import net.minecraft.server.network.ServerPlayerEntity;
|
import net.minecraft.server.network.ServerPlayerEntity;
|
||||||
import net.minecraft.text.Text;
|
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import net.minecraft.block.BedBlock;
|
import net.minecraft.block.BedBlock;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,6 @@ import modchest.REServerMod;
|
||||||
import modchest.networking.packet.deathScreenMultiButtonsC2SPacket;
|
import modchest.networking.packet.deathScreenMultiButtonsC2SPacket;
|
||||||
import modchest.networking.packet.setNewRespawnsC2SPacket;
|
import modchest.networking.packet.setNewRespawnsC2SPacket;
|
||||||
import modchest.networking.payload.deathMultiRespawnButtons;
|
import modchest.networking.payload.deathMultiRespawnButtons;
|
||||||
import modchest.networking.payload.requestRespawn;
|
|
||||||
import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
|
import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
|
||||||
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
|
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
|
||||||
import modchest.networking.payload.startSleepingCallButtons;
|
import modchest.networking.payload.startSleepingCallButtons;
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
package modchest.util;
|
package modchest.util;
|
||||||
|
|
||||||
import net.minecraft.nbt.NbtCompound;
|
import net.minecraft.nbt.NbtCompound;
|
||||||
import net.minecraft.server.network.ServerPlayerEntity;
|
|
||||||
import org.spongepowered.asm.mixin.Unique;
|
|
||||||
|
|
||||||
public interface ServerPlayerEntityInterface {
|
public interface ServerPlayerEntityInterface {
|
||||||
NbtCompound getDataSaver();
|
NbtCompound getDataSaver();
|
||||||
|
|
|
@ -2,7 +2,6 @@ package modchest.util;
|
||||||
|
|
||||||
import modchest.REServerMod;
|
import modchest.REServerMod;
|
||||||
import net.minecraft.nbt.NbtCompound;
|
import net.minecraft.nbt.NbtCompound;
|
||||||
import net.minecraft.nbt.NbtElement;
|
|
||||||
import net.minecraft.registry.RegistryKey;
|
import net.minecraft.registry.RegistryKey;
|
||||||
import net.minecraft.server.network.ServerPlayerEntity;
|
import net.minecraft.server.network.ServerPlayerEntity;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
|
|
Loading…
Reference in New Issue