Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions common/src/main/java/net/adeptstack/Core/Network/ModNetwork.java

This file was deleted.

7 changes: 2 additions & 5 deletions common/src/main/java/net/adeptstack/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,11 @@
import com.simibubi.create.foundation.item.KineticStats;
import com.simibubi.create.foundation.item.TooltipHelper;
import com.simibubi.create.foundation.item.TooltipModifier;
import com.tterrag.registrate.providers.ProviderType;
import dev.architectury.platform.Platform;
import net.adeptstack.Blocks.Doors.SlidingDoor.TrainSlidingDoorBlock;
import net.adeptstack.Core.Network.ModNetwork;
import net.adeptstack.blocks.doors.slidingDoor.TrainSlidingDoorBlock;
import net.adeptstack.network.ModNetwork;
import net.adeptstack.registry.*;
import net.fabricmc.api.EnvType;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.DataProvider;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.adeptstack.Blocks.Behaviour.DoorBlock;
package net.adeptstack.behaviour.doorBlock;

import com.simibubi.create.content.contraptions.Contraption;
import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
Expand All @@ -11,10 +11,6 @@
import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
import com.simibubi.create.content.trains.station.GlobalStation;
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
import com.simibubi.create.foundation.utility.animation.LerpedFloat;
import net.adeptstack.Blocks.Doors.SlidingDoor.TrainSlidingDoorBlock;
import net.adeptstack.Blocks.Doors.SlidingDoor.TrainSlidingDoorBlockEntity;
import net.adeptstack.registry.TrainUtilitiesBuilderTransformers;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.resources.ResourceKey;
Expand All @@ -24,16 +20,12 @@
import net.minecraft.sounds.SoundSource;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.DoorBlock;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.DoorHingeSide;
import net.minecraft.world.level.block.state.properties.DoubleBlockHalf;
import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
import net.minecraft.world.phys.Vec3;

import java.lang.ref.WeakReference;
import java.util.Map;
import java.util.TimerTask;

public class DoorBlockMovementBehaviour implements MovementBehaviour {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package net.adeptstack.Blocks.Behaviour.DoorBlock;
package net.adeptstack.behaviour.doorBlock;

import com.simibubi.create.content.contraptions.Contraption;
import com.simibubi.create.content.contraptions.behaviour.SimpleBlockMovingInteraction;
import net.adeptstack.Blocks.Doors.SlidingDoor.TrainSlidingDoorBlock;
import net.adeptstack.blocks.doors.slidingDoor.TrainSlidingDoorBlock;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.sounds.SoundEvent;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.adeptstack.Blocks.Behaviour.SlidingDoor;
package net.adeptstack.behaviour.slidingDoor;

import com.simibubi.create.content.contraptions.Contraption;
import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
Expand All @@ -8,15 +8,13 @@
import com.simibubi.create.content.decoration.slidingDoor.DoorControl;
import com.simibubi.create.content.decoration.slidingDoor.DoorControlBehaviour;
import com.simibubi.create.content.trains.entity.Carriage;
import com.simibubi.create.content.trains.entity.CarriageContraption;
import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
import com.simibubi.create.content.trains.station.GlobalStation;
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
import com.simibubi.create.foundation.utility.animation.LerpedFloat;
import net.adeptstack.Blocks.Doors.SlidingDoor.TrainSlidingDoorBlock;
import net.adeptstack.Core.Client.ClientWrapper;
import net.adeptstack.Core.Utils.TrainSlidingDoorProperties;
import net.adeptstack.Blocks.Doors.SlidingDoor.TrainSlidingDoorBlockEntity;
import net.adeptstack.blocks.doors.slidingDoor.TrainSlidingDoorBlock;
import net.adeptstack.utils.TrainSlidingDoorProperties;
import net.adeptstack.blocks.doors.slidingDoor.TrainSlidingDoorBlockEntity;
import net.adeptstack.registry.TrainUtilitiesBuilderTransformers;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
Expand All @@ -35,8 +33,6 @@

import java.lang.ref.WeakReference;
import java.util.Map;
import java.util.Timer;
import java.util.TimerTask;

public class TrainSlidingDoorMovementBehaviour implements MovementBehaviour {

Expand All @@ -61,7 +57,7 @@ public void tick(MovementContext context) {
int ticksOpen = context.data.getInt("OpenTicks");
ticksOpen++;
context.data.putInt("OpenTicks", ticksOpen);
if (ticksOpen > 240) {
if (ticksOpen > 180) {
tickClose(context, true);
context.data.putInt("OpenTicks", 0);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package net.adeptstack.Blocks.Behaviour.SlidingDoor;
package net.adeptstack.behaviour.slidingDoor;

import com.simibubi.create.content.contraptions.Contraption;
import com.simibubi.create.content.contraptions.behaviour.SimpleBlockMovingInteraction;
import net.adeptstack.Blocks.Doors.SlidingDoor.TrainSlidingDoorBlock;
import net.adeptstack.blocks.doors.slidingDoor.TrainSlidingDoorBlock;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.sounds.SoundEvent;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.adeptstack.Blocks;
package net.adeptstack.blocks;

import net.minecraft.core.Direction;
import net.minecraft.world.item.context.BlockPlaceContext;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
package net.adeptstack.Blocks.Doors.SlidingDoor;
package net.adeptstack.blocks.doors.slidingDoor;

import com.simibubi.create.content.contraptions.behaviour.MovementContext;
import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorBlock;
import com.simibubi.create.foundation.item.ItemDescription;
import com.simibubi.create.foundation.item.KineticStats;
import com.simibubi.create.foundation.item.TooltipHelper;
import com.simibubi.create.foundation.item.TooltipModifier;
import net.adeptstack.Core.Client.ClientWrapper;
import net.adeptstack.Core.Utils.ScreenUtils.PlacementUtils;
import net.adeptstack.client.ClientWrapper;
import net.adeptstack.utils.PlacementUtils;
import net.adeptstack.registry.ModBlockEntities;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.entity.BlockEntityType;
Expand All @@ -26,9 +20,6 @@
import net.minecraft.world.level.block.state.properties.IntegerProperty;
import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
import net.minecraft.world.phys.BlockHitResult;
import org.jetbrains.annotations.Nullable;

import static net.adeptstack.Main.REGISTRATE;

public class TrainSlidingDoorBlock extends SlidingDoorBlock {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package net.adeptstack.Blocks.Doors.SlidingDoor;
package net.adeptstack.blocks.doors.slidingDoor;

import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorBlockEntity;
import com.simibubi.create.foundation.utility.animation.LerpedFloat;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.block.DoorBlock;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package net.adeptstack.Blocks.Doors.SlidingDoor;
package net.adeptstack.blocks.doors.slidingDoor;

import com.jozufozu.flywheel.core.PartialModel;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import com.simibubi.create.AllPartialModels;
import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorBlock;
import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorBlockEntity;
import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorRenderer;
import com.simibubi.create.foundation.render.CachedBufferer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package net.adeptstack.Blocks.PanelBlocks;
package net.adeptstack.blocks.panelBlocks;

import net.adeptstack.Core.Enums.EMultiBlockPart;
import net.adeptstack.Core.Utils.ScreenUtils.PlacementUtils;
import net.adeptstack.utils.enums.EMultiBlockPart;
import net.adeptstack.utils.PlacementUtils;
import net.minecraft.core.BlockPos;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.ItemStack;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package net.adeptstack.Blocks.PanelBlocks;
package net.adeptstack.blocks.panelBlocks;

import net.adeptstack.Core.Enums.EBlockPlacePosition;
import net.adeptstack.utils.enums.EBlockPlacePosition;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.world.item.context.BlockPlaceContext;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package net.adeptstack.Blocks.PanelBlocks.PlatformBlocks;
package net.adeptstack.blocks.panelBlocks.platformBlocks;

import net.adeptstack.Blocks.PanelBlocks.PanelBlockBase;
import net.adeptstack.Core.Client.ClientWrapper;
import net.adeptstack.blocks.panelBlocks.PanelBlockBase;
import net.adeptstack.client.ClientWrapper;
import net.minecraft.core.BlockPos;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package net.adeptstack.Blocks.PanelBlocks.PlatformBlocks;
package net.adeptstack.blocks.panelBlocks.platformBlocks;

import net.adeptstack.Blocks.PanelBlocks.PanelBlockBase;
import net.adeptstack.Core.Client.ClientWrapper;
import net.adeptstack.blocks.panelBlocks.PanelBlockBase;
import net.adeptstack.client.ClientWrapper;
import net.minecraft.core.BlockPos;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package net.adeptstack.Blocks.PanelBlocks.PlatformBlocks;
package net.adeptstack.blocks.panelBlocks.platformBlocks;

import net.adeptstack.Blocks.PanelBlocks.PanelBlockBase;
import net.adeptstack.Core.Client.ClientWrapper;
import net.adeptstack.blocks.panelBlocks.PanelBlockBase;
import net.adeptstack.client.ClientWrapper;
import net.minecraft.core.BlockPos;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
package net.adeptstack.Core.Client;
package net.adeptstack.client;

import net.adeptstack.Blocks.Doors.SlidingDoor.TrainSlidingDoorBlock;
import net.adeptstack.Blocks.PanelBlocks.PlatformBlocks.PlatformBlockCH;
import net.adeptstack.Blocks.PanelBlocks.PlatformBlocks.PlatformBlockDE;
import net.adeptstack.Blocks.PanelBlocks.PlatformBlocks.PlatformBlockNL;
import net.adeptstack.Core.Network.ModNetwork;
import net.adeptstack.Core.Network.Packages.ChangeDoorSoundPackage;
import net.adeptstack.Core.Network.Packages.PlatformBlockPackage;
import net.adeptstack.Core.UI.Screens.ChangeDoorSoundScreen;
import net.adeptstack.Core.UI.Screens.PlatformBlocks.PlatformBlockCHPlacementScreen;
import net.adeptstack.Core.UI.Screens.PlatformBlocks.PlatformBlockDEPlacementScreen;
import net.adeptstack.Core.UI.Screens.PlatformBlocks.PlatformBlockNLPlacementScreen;
import net.adeptstack.Core.Utils.ScreenUtils.TextureNames;
import net.adeptstack.blocks.doors.slidingDoor.TrainSlidingDoorBlock;
import net.adeptstack.blocks.panelBlocks.platformBlocks.PlatformBlockCH;
import net.adeptstack.blocks.panelBlocks.platformBlocks.PlatformBlockDE;
import net.adeptstack.blocks.panelBlocks.platformBlocks.PlatformBlockNL;
import net.adeptstack.network.ModNetwork;
import net.adeptstack.network.packets.ChangeDoorSoundPacket;
import net.adeptstack.network.packets.PlatformBlockPacket;
import net.adeptstack.ui.screens.ChangeDoorSoundScreen;
import net.adeptstack.ui.screens.platformBlocks.PlatformBlockCHPlacementScreen;
import net.adeptstack.ui.screens.platformBlocks.PlatformBlockDEPlacementScreen;
import net.adeptstack.ui.screens.platformBlocks.PlatformBlockNLPlacementScreen;
import net.adeptstack.utils.screenUtils.TextureNames;
import net.minecraft.client.Minecraft;
import net.minecraft.core.BlockPos;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.block.state.BlockState;

import java.awt.desktop.SystemSleepEvent;

import static net.adeptstack.Main.MOD_ID;

public class ClientWrapper {
Expand All @@ -33,7 +31,7 @@ public static void openPlatformBlockDEScreen(BlockPos pos, BlockState blockState
String name = TextureNames.GetDEPlatformBlockTextureName(variant);
return new PlatformBlockDEPlacementScreen.TextureResult(new ResourceLocation(MOD_ID, "textures/block/platformblocks/" + name), 256, 256);
}, (variant) -> {
ModNetwork.CHANNEL.sendToServer(new PlatformBlockPackage(pos, variant));
ModNetwork.CHANNEL.sendToServer(new PlatformBlockPacket(pos, variant));
},
"gui." + MOD_ID + ".selection_screen.blockplacementscreen_de", 1
)
Expand All @@ -49,7 +47,7 @@ public static void openPlatformBlockNLScreen(BlockPos pos, BlockState blockState
String name = TextureNames.GetNLPlatformBlockTextureName(variant);
return new PlatformBlockNLPlacementScreen.TextureResult(new ResourceLocation(MOD_ID, "textures/block/nl_platformblocks/" + name), 256, 256);
}, (variant) -> {
ModNetwork.CHANNEL.sendToServer(new PlatformBlockPackage(pos, variant));
ModNetwork.CHANNEL.sendToServer(new PlatformBlockPacket(pos, variant));
},
"gui." + MOD_ID + ".selection_screen.blockplacementscreen_nl", 2
)
Expand All @@ -65,7 +63,7 @@ public static void openPlatformBlockCHScreen(BlockPos pos, BlockState blockState
String name = TextureNames.GetCHPlatformBlockTextureName(variant);
return new PlatformBlockCHPlacementScreen.TextureResult(new ResourceLocation(MOD_ID, "textures/block/ch_platformblocks/" + name), 256, 256);
}, (variant) -> {
ModNetwork.CHANNEL.sendToServer(new PlatformBlockPackage(pos, variant));
ModNetwork.CHANNEL.sendToServer(new PlatformBlockPacket(pos, variant));
},
"gui." + MOD_ID + ".selection_screen.blockplacementscreen_ch", 3
)
Expand All @@ -83,7 +81,7 @@ public static void openChangeDoorSoundScreen(BlockPos pos, BlockState blockState
String name = TextureNames.GetDoorTextureName(variant);
return new ChangeDoorSoundScreen.TextureResult(new ResourceLocation(MOD_ID, "textures/item/" + name), 16, 16);
}, (variant) -> {
ModNetwork.CHANNEL.sendToServer(new ChangeDoorSoundPackage(pos, variant));
ModNetwork.CHANNEL.sendToServer(new ChangeDoorSoundPacket(pos, variant));
},
"gui." + MOD_ID + ".selection_screen.changeDoorSoundScreen"
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.adeptstack.Mixin;
package net.adeptstack.mixin;

import com.simibubi.create.AllSoundEvents;
import com.simibubi.create.content.contraptions.AbstractContraptionEntity;
Expand Down
18 changes: 18 additions & 0 deletions common/src/main/java/net/adeptstack/network/ModNetwork.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package net.adeptstack.network;

import dev.architectury.networking.NetworkChannel;
import net.adeptstack.network.packets.ChangeDoorSoundPacket;
import net.adeptstack.network.packets.PlatformBlockPacket;
import net.minecraft.resources.ResourceLocation;

import static net.adeptstack.Main.MOD_ID;

public class ModNetwork {

public static final NetworkChannel CHANNEL = NetworkChannel.create(new ResourceLocation(MOD_ID, MOD_ID + "_network"));

public static void init() {
CHANNEL.register(PlatformBlockPacket.class, PlatformBlockPacket::encode, PlatformBlockPacket::new, PlatformBlockPacket::apply);
CHANNEL.register(ChangeDoorSoundPacket.class, ChangeDoorSoundPacket::encode, ChangeDoorSoundPacket::new, ChangeDoorSoundPacket::apply);
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package net.adeptstack.Core.Network.Packages;
package net.adeptstack.network.packets;

import dev.architectury.networking.NetworkManager;
import net.adeptstack.Blocks.Doors.SlidingDoor.TrainSlidingDoorBlock;
import net.adeptstack.Core.Utils.ScreenUtils.PlacementUtils;
import net.adeptstack.blocks.doors.slidingDoor.TrainSlidingDoorBlock;
import net.adeptstack.utils.PlacementUtils;
import net.minecraft.core.BlockPos;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.world.level.block.state.BlockState;
Expand All @@ -11,16 +11,16 @@

import java.util.function.Supplier;

public class ChangeDoorSoundPackage {
public class ChangeDoorSoundPacket {
public final BlockPos pos;
public final int door_sound;


public ChangeDoorSoundPackage(FriendlyByteBuf buf) {
public ChangeDoorSoundPacket(FriendlyByteBuf buf) {
this(buf.readBlockPos(), buf.readInt());
}

public ChangeDoorSoundPackage(BlockPos pos, int door_sound) {
public ChangeDoorSoundPacket(BlockPos pos, int door_sound) {
this.pos = pos;
this.door_sound = door_sound;
}
Expand Down
Loading