Malte/minecraft-mod
Malte
/
minecraft-mod
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 5 Wiki Activity

main #22

Merged
Hanno merged 7 commits from main into mc-1.21 2024-07-19 17:50:28 +02:00
Conversation 0 Commits 7 Files Changed 92 +2 -19
9 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bc9bee3d74 - Show all commits

4
build.gradle
View File

@ -33,7 +33,7 @@ loom {
inherit server
name "Data Generation"
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"
runDir "build/datagen"
@ -46,7 +46,7 @@ sourceSets {
main {
resources {
srcDirs += [
'src/main/generated'
'src/main/java'
]
}
}

1
src/client/java/modchestClient/networking/modNetworkingClient.java
View File

@ -3,7 +3,6 @@ package modchestClient.networking;
import modchest.REServerMod;
import modchestClient.networking.packet.respawnRequestS2CPacket;
import modchestClient.networking.payload.requestRespawn;
import modchestClient.networking.payload.startSleepingCallButtons;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
import net.minecraft.util.Identifier;

5
src/main/java/modchest/block/custom/steeringWheelBlock.java
View File

@ -9,12 +9,7 @@ import net.minecraft.block.BlockWithEntity;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.block.entity.BlockEntityTicker;
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.hit.BlockHitResult;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import org.jetbrains.annotations.Nullable;

2
src/main/java/modchest/event/playerAfterRespawnEvent.java
View File

@ -4,8 +4,6 @@ import modchest.REServerMod;
import modchest.util.setAndGetMultiButtonsSpawn;
import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.RegistryKeys;
import net.minecraft.server.network.ServerPlayerEntity;

2
src/main/java/modchest/mixin/ServerPlayerEntityMixin.java
View File

@ -10,8 +10,6 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.Arrays;
@Mixin(ServerPlayerEntity.class)
public abstract class ServerPlayerEntityMixin implements ServerPlayerEntityInterface {
@Unique

3
src/main/java/modchest/mixin/bedBlock.java
View File

@ -5,17 +5,14 @@ import modchest.util.setAndGetMultiButtonsSpawn;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import org.spongepowered.asm.mixin.Mixin;
import net.minecraft.block.BedBlock;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;

1
src/main/java/modchest/networking/modNetworkingServer.java
View File

@ -4,7 +4,6 @@ import modchest.REServerMod;
import modchest.networking.packet.deathScreenMultiButtonsC2SPacket;
import modchest.networking.packet.setNewRespawnsC2SPacket;
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.ServerPlayNetworking;
import modchest.networking.payload.startSleepingCallButtons;

2
src/main/java/modchest/util/ServerPlayerEntityInterface.java
View File

@ -1,8 +1,6 @@
package modchest.util;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.server.network.ServerPlayerEntity;
import org.spongepowered.asm.mixin.Unique;
public interface ServerPlayerEntityInterface {
NbtCompound getDataSaver();

1
src/main/java/modchest/util/setAndGetMultiButtonsSpawn.java
View File

@ -2,7 +2,6 @@ package modchest.util;
import modchest.REServerMod;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.nbt.NbtElement;
import net.minecraft.registry.RegistryKey;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;