diff --git a/common/src/main/java/net/adeptstack/Core/Network/ModNetwork.java b/common/src/main/java/net/adeptstack/Core/Network/ModNetwork.java deleted file mode 100644 index 6e706d7..0000000 --- a/common/src/main/java/net/adeptstack/Core/Network/ModNetwork.java +++ /dev/null @@ -1,18 +0,0 @@ -package net.adeptstack.Core.Network; - -import dev.architectury.networking.NetworkChannel; -import net.adeptstack.Core.Network.Packages.ChangeDoorSoundPackage; -import net.adeptstack.Core.Network.Packages.PlatformBlockPackage; -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(PlatformBlockPackage.class, PlatformBlockPackage::encode, PlatformBlockPackage::new, PlatformBlockPackage::apply); - CHANNEL.register(ChangeDoorSoundPackage.class, ChangeDoorSoundPackage::encode, ChangeDoorSoundPackage::new, ChangeDoorSoundPackage::apply); - } -} diff --git a/common/src/main/java/net/adeptstack/Main.java b/common/src/main/java/net/adeptstack/Main.java index 4f9c705..dee9957 100644 --- a/common/src/main/java/net/adeptstack/Main.java +++ b/common/src/main/java/net/adeptstack/Main.java @@ -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; diff --git a/common/src/main/java/net/adeptstack/Blocks/Behaviour/DoorBlock/DoorBlockMovementBehaviour.java b/common/src/main/java/net/adeptstack/behaviour/doorBlock/DoorBlockMovementBehaviour.java similarity index 94% rename from common/src/main/java/net/adeptstack/Blocks/Behaviour/DoorBlock/DoorBlockMovementBehaviour.java rename to common/src/main/java/net/adeptstack/behaviour/doorBlock/DoorBlockMovementBehaviour.java index 83af00c..ed4c5f4 100644 --- a/common/src/main/java/net/adeptstack/Blocks/Behaviour/DoorBlock/DoorBlockMovementBehaviour.java +++ b/common/src/main/java/net/adeptstack/behaviour/doorBlock/DoorBlockMovementBehaviour.java @@ -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; @@ -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; @@ -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 { diff --git a/common/src/main/java/net/adeptstack/Blocks/Behaviour/DoorBlock/DoorBlockMovingInteraction.java b/common/src/main/java/net/adeptstack/behaviour/doorBlock/DoorBlockMovingInteraction.java similarity index 96% rename from common/src/main/java/net/adeptstack/Blocks/Behaviour/DoorBlock/DoorBlockMovingInteraction.java rename to common/src/main/java/net/adeptstack/behaviour/doorBlock/DoorBlockMovingInteraction.java index 739cf10..0cf4ebd 100644 --- a/common/src/main/java/net/adeptstack/Blocks/Behaviour/DoorBlock/DoorBlockMovingInteraction.java +++ b/common/src/main/java/net/adeptstack/behaviour/doorBlock/DoorBlockMovingInteraction.java @@ -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; diff --git a/common/src/main/java/net/adeptstack/Blocks/Behaviour/SlidingDoor/TrainSlidingDoorMovementBehaviour.java b/common/src/main/java/net/adeptstack/behaviour/slidingDoor/TrainSlidingDoorMovementBehaviour.java similarity index 96% rename from common/src/main/java/net/adeptstack/Blocks/Behaviour/SlidingDoor/TrainSlidingDoorMovementBehaviour.java rename to common/src/main/java/net/adeptstack/behaviour/slidingDoor/TrainSlidingDoorMovementBehaviour.java index a4ca4c8..217c65e 100644 --- a/common/src/main/java/net/adeptstack/Blocks/Behaviour/SlidingDoor/TrainSlidingDoorMovementBehaviour.java +++ b/common/src/main/java/net/adeptstack/behaviour/slidingDoor/TrainSlidingDoorMovementBehaviour.java @@ -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; @@ -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; @@ -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 { @@ -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); } diff --git a/common/src/main/java/net/adeptstack/Blocks/Behaviour/SlidingDoor/TrainSlidingDoorMovingInteraction.java b/common/src/main/java/net/adeptstack/behaviour/slidingDoor/TrainSlidingDoorMovingInteraction.java similarity index 96% rename from common/src/main/java/net/adeptstack/Blocks/Behaviour/SlidingDoor/TrainSlidingDoorMovingInteraction.java rename to common/src/main/java/net/adeptstack/behaviour/slidingDoor/TrainSlidingDoorMovingInteraction.java index 71a4c6c..ba20248 100644 --- a/common/src/main/java/net/adeptstack/Blocks/Behaviour/SlidingDoor/TrainSlidingDoorMovingInteraction.java +++ b/common/src/main/java/net/adeptstack/behaviour/slidingDoor/TrainSlidingDoorMovingInteraction.java @@ -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; diff --git a/common/src/main/java/net/adeptstack/Blocks/LineBlock.java b/common/src/main/java/net/adeptstack/blocks/LineBlock.java similarity index 98% rename from common/src/main/java/net/adeptstack/Blocks/LineBlock.java rename to common/src/main/java/net/adeptstack/blocks/LineBlock.java index 537d4e8..9644823 100644 --- a/common/src/main/java/net/adeptstack/Blocks/LineBlock.java +++ b/common/src/main/java/net/adeptstack/blocks/LineBlock.java @@ -1,4 +1,4 @@ -package net.adeptstack.Blocks; +package net.adeptstack.blocks; import net.minecraft.core.Direction; import net.minecraft.world.item.context.BlockPlaceContext; diff --git a/common/src/main/java/net/adeptstack/Blocks/Doors/SlidingDoor/TrainSlidingDoorBlock.java b/common/src/main/java/net/adeptstack/blocks/doors/slidingDoor/TrainSlidingDoorBlock.java similarity index 86% rename from common/src/main/java/net/adeptstack/Blocks/Doors/SlidingDoor/TrainSlidingDoorBlock.java rename to common/src/main/java/net/adeptstack/blocks/doors/slidingDoor/TrainSlidingDoorBlock.java index 05faab1..908b912 100644 --- a/common/src/main/java/net/adeptstack/Blocks/Doors/SlidingDoor/TrainSlidingDoorBlock.java +++ b/common/src/main/java/net/adeptstack/blocks/doors/slidingDoor/TrainSlidingDoorBlock.java @@ -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; @@ -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 { diff --git a/common/src/main/java/net/adeptstack/Blocks/Doors/SlidingDoor/TrainSlidingDoorBlockEntity.java b/common/src/main/java/net/adeptstack/blocks/doors/slidingDoor/TrainSlidingDoorBlockEntity.java similarity index 93% rename from common/src/main/java/net/adeptstack/Blocks/Doors/SlidingDoor/TrainSlidingDoorBlockEntity.java rename to common/src/main/java/net/adeptstack/blocks/doors/slidingDoor/TrainSlidingDoorBlockEntity.java index 0a36ed9..2b3aa7b 100644 --- a/common/src/main/java/net/adeptstack/Blocks/Doors/SlidingDoor/TrainSlidingDoorBlockEntity.java +++ b/common/src/main/java/net/adeptstack/blocks/doors/slidingDoor/TrainSlidingDoorBlockEntity.java @@ -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; diff --git a/common/src/main/java/net/adeptstack/Blocks/Doors/SlidingDoor/TrainSlidingDoorBlockRenderer.java b/common/src/main/java/net/adeptstack/blocks/doors/slidingDoor/TrainSlidingDoorBlockRenderer.java similarity index 96% rename from common/src/main/java/net/adeptstack/Blocks/Doors/SlidingDoor/TrainSlidingDoorBlockRenderer.java rename to common/src/main/java/net/adeptstack/blocks/doors/slidingDoor/TrainSlidingDoorBlockRenderer.java index 1b9102b..39666cf 100644 --- a/common/src/main/java/net/adeptstack/Blocks/Doors/SlidingDoor/TrainSlidingDoorBlockRenderer.java +++ b/common/src/main/java/net/adeptstack/blocks/doors/slidingDoor/TrainSlidingDoorBlockRenderer.java @@ -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; diff --git a/common/src/main/java/net/adeptstack/Blocks/PanelBlocks/IsoWallBlock.java b/common/src/main/java/net/adeptstack/blocks/panelBlocks/IsoWallBlock.java similarity index 97% rename from common/src/main/java/net/adeptstack/Blocks/PanelBlocks/IsoWallBlock.java rename to common/src/main/java/net/adeptstack/blocks/panelBlocks/IsoWallBlock.java index 3016a4c..cdc8c34 100644 --- a/common/src/main/java/net/adeptstack/Blocks/PanelBlocks/IsoWallBlock.java +++ b/common/src/main/java/net/adeptstack/blocks/panelBlocks/IsoWallBlock.java @@ -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; diff --git a/common/src/main/java/net/adeptstack/Blocks/PanelBlocks/PanelBlockBase.java b/common/src/main/java/net/adeptstack/blocks/panelBlocks/PanelBlockBase.java similarity index 97% rename from common/src/main/java/net/adeptstack/Blocks/PanelBlocks/PanelBlockBase.java rename to common/src/main/java/net/adeptstack/blocks/panelBlocks/PanelBlockBase.java index aad0a84..c637b4a 100644 --- a/common/src/main/java/net/adeptstack/Blocks/PanelBlocks/PanelBlockBase.java +++ b/common/src/main/java/net/adeptstack/blocks/panelBlocks/PanelBlockBase.java @@ -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; diff --git a/common/src/main/java/net/adeptstack/Blocks/PanelBlocks/PlatformBlocks/PlatformBlockCH.java b/common/src/main/java/net/adeptstack/blocks/panelBlocks/platformBlocks/PlatformBlockCH.java similarity index 89% rename from common/src/main/java/net/adeptstack/Blocks/PanelBlocks/PlatformBlocks/PlatformBlockCH.java rename to common/src/main/java/net/adeptstack/blocks/panelBlocks/platformBlocks/PlatformBlockCH.java index 077ca2b..31c1cd3 100644 --- a/common/src/main/java/net/adeptstack/Blocks/PanelBlocks/PlatformBlocks/PlatformBlockCH.java +++ b/common/src/main/java/net/adeptstack/blocks/panelBlocks/platformBlocks/PlatformBlockCH.java @@ -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; diff --git a/common/src/main/java/net/adeptstack/Blocks/PanelBlocks/PlatformBlocks/PlatformBlockDE.java b/common/src/main/java/net/adeptstack/blocks/panelBlocks/platformBlocks/PlatformBlockDE.java similarity index 89% rename from common/src/main/java/net/adeptstack/Blocks/PanelBlocks/PlatformBlocks/PlatformBlockDE.java rename to common/src/main/java/net/adeptstack/blocks/panelBlocks/platformBlocks/PlatformBlockDE.java index 1060049..acc7693 100644 --- a/common/src/main/java/net/adeptstack/Blocks/PanelBlocks/PlatformBlocks/PlatformBlockDE.java +++ b/common/src/main/java/net/adeptstack/blocks/panelBlocks/platformBlocks/PlatformBlockDE.java @@ -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; diff --git a/common/src/main/java/net/adeptstack/Blocks/PanelBlocks/PlatformBlocks/PlatformBlockNL.java b/common/src/main/java/net/adeptstack/blocks/panelBlocks/platformBlocks/PlatformBlockNL.java similarity index 89% rename from common/src/main/java/net/adeptstack/Blocks/PanelBlocks/PlatformBlocks/PlatformBlockNL.java rename to common/src/main/java/net/adeptstack/blocks/panelBlocks/platformBlocks/PlatformBlockNL.java index 6eb584f..097ab66 100644 --- a/common/src/main/java/net/adeptstack/Blocks/PanelBlocks/PlatformBlocks/PlatformBlockNL.java +++ b/common/src/main/java/net/adeptstack/blocks/panelBlocks/platformBlocks/PlatformBlockNL.java @@ -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; diff --git a/common/src/main/java/net/adeptstack/Core/Client/ClientWrapper.java b/common/src/main/java/net/adeptstack/client/ClientWrapper.java similarity index 79% rename from common/src/main/java/net/adeptstack/Core/Client/ClientWrapper.java rename to common/src/main/java/net/adeptstack/client/ClientWrapper.java index 72700d2..b626089 100644 --- a/common/src/main/java/net/adeptstack/Core/Client/ClientWrapper.java +++ b/common/src/main/java/net/adeptstack/client/ClientWrapper.java @@ -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 { @@ -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 ) @@ -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 ) @@ -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 ) @@ -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" ) diff --git a/common/src/main/java/net/adeptstack/Mixin/ContraptionControlsMovingInteractionMixin.java b/common/src/main/java/net/adeptstack/mixin/ContraptionControlsMovingInteractionMixin.java similarity index 99% rename from common/src/main/java/net/adeptstack/Mixin/ContraptionControlsMovingInteractionMixin.java rename to common/src/main/java/net/adeptstack/mixin/ContraptionControlsMovingInteractionMixin.java index 1dd7d1d..ef94171 100644 --- a/common/src/main/java/net/adeptstack/Mixin/ContraptionControlsMovingInteractionMixin.java +++ b/common/src/main/java/net/adeptstack/mixin/ContraptionControlsMovingInteractionMixin.java @@ -1,4 +1,4 @@ -package net.adeptstack.Mixin; +package net.adeptstack.mixin; import com.simibubi.create.AllSoundEvents; import com.simibubi.create.content.contraptions.AbstractContraptionEntity; diff --git a/common/src/main/java/net/adeptstack/network/ModNetwork.java b/common/src/main/java/net/adeptstack/network/ModNetwork.java new file mode 100644 index 0000000..8dadb0e --- /dev/null +++ b/common/src/main/java/net/adeptstack/network/ModNetwork.java @@ -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); + } +} diff --git a/common/src/main/java/net/adeptstack/Core/Network/Packages/ChangeDoorSoundPackage.java b/common/src/main/java/net/adeptstack/network/packets/ChangeDoorSoundPacket.java similarity index 94% rename from common/src/main/java/net/adeptstack/Core/Network/Packages/ChangeDoorSoundPackage.java rename to common/src/main/java/net/adeptstack/network/packets/ChangeDoorSoundPacket.java index f0501eb..8a147cd 100644 --- a/common/src/main/java/net/adeptstack/Core/Network/Packages/ChangeDoorSoundPackage.java +++ b/common/src/main/java/net/adeptstack/network/packets/ChangeDoorSoundPacket.java @@ -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; @@ -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; } diff --git a/common/src/main/java/net/adeptstack/Core/Network/Packages/PlatformBlockPackage.java b/common/src/main/java/net/adeptstack/network/packets/PlatformBlockPacket.java similarity index 78% rename from common/src/main/java/net/adeptstack/Core/Network/Packages/PlatformBlockPackage.java rename to common/src/main/java/net/adeptstack/network/packets/PlatformBlockPacket.java index 2d0bf39..2ebb9fe 100644 --- a/common/src/main/java/net/adeptstack/Core/Network/Packages/PlatformBlockPackage.java +++ b/common/src/main/java/net/adeptstack/network/packets/PlatformBlockPacket.java @@ -1,26 +1,26 @@ -package net.adeptstack.Core.Network.Packages; +package net.adeptstack.network.packets; import dev.architectury.networking.NetworkManager; -import net.adeptstack.Blocks.PanelBlocks.PlatformBlocks.PlatformBlockCH; -import net.adeptstack.Blocks.PanelBlocks.PlatformBlocks.PlatformBlockDE; -import net.adeptstack.Blocks.PanelBlocks.PlatformBlocks.PlatformBlockNL; +import net.adeptstack.blocks.panelBlocks.platformBlocks.PlatformBlockCH; +import net.adeptstack.blocks.panelBlocks.platformBlocks.PlatformBlockDE; +import net.adeptstack.blocks.panelBlocks.platformBlocks.PlatformBlockNL; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.level.block.state.BlockState; import java.util.function.Supplier; -public class PlatformBlockPackage { +public class PlatformBlockPacket { public final BlockPos pos; public final int signblock; - public PlatformBlockPackage(FriendlyByteBuf buf) { + public PlatformBlockPacket(FriendlyByteBuf buf) { this(buf.readBlockPos(), buf.readInt()); } - public PlatformBlockPackage(BlockPos pos, int signblock) { + public PlatformBlockPacket(BlockPos pos, int signblock) { this.pos = pos; this.signblock = signblock; } diff --git a/common/src/main/java/net/adeptstack/registry/ModBlockEntities.java b/common/src/main/java/net/adeptstack/registry/ModBlockEntities.java index 27c527a..4fabe79 100644 --- a/common/src/main/java/net/adeptstack/registry/ModBlockEntities.java +++ b/common/src/main/java/net/adeptstack/registry/ModBlockEntities.java @@ -1,8 +1,8 @@ package net.adeptstack.registry; import com.tterrag.registrate.util.entry.BlockEntityEntry; -import net.adeptstack.Blocks.Doors.SlidingDoor.TrainSlidingDoorBlockEntity; -import net.adeptstack.Blocks.Doors.SlidingDoor.TrainSlidingDoorBlockRenderer; +import net.adeptstack.blocks.doors.slidingDoor.TrainSlidingDoorBlockEntity; +import net.adeptstack.blocks.doors.slidingDoor.TrainSlidingDoorBlockRenderer; import static net.adeptstack.Main.REGISTRATE; diff --git a/common/src/main/java/net/adeptstack/registry/ModBlocks.java b/common/src/main/java/net/adeptstack/registry/ModBlocks.java index ee1ec2f..ed42994 100644 --- a/common/src/main/java/net/adeptstack/registry/ModBlocks.java +++ b/common/src/main/java/net/adeptstack/registry/ModBlocks.java @@ -2,12 +2,12 @@ import com.simibubi.create.content.decoration.palettes.GlassPaneBlock; import com.tterrag.registrate.util.entry.BlockEntry; -import net.adeptstack.Blocks.Doors.SlidingDoor.TrainSlidingDoorBlock; -import net.adeptstack.Blocks.PanelBlocks.IsoWallBlock; -import net.adeptstack.Blocks.PanelBlocks.PlatformBlocks.PlatformBlockCH; -import net.adeptstack.Blocks.PanelBlocks.PlatformBlocks.PlatformBlockDE; -import net.adeptstack.Blocks.PanelBlocks.PlatformBlocks.PlatformBlockNL; -import net.adeptstack.Blocks.LineBlock; +import net.adeptstack.blocks.doors.slidingDoor.TrainSlidingDoorBlock; +import net.adeptstack.blocks.panelBlocks.IsoWallBlock; +import net.adeptstack.blocks.panelBlocks.platformBlocks.PlatformBlockCH; +import net.adeptstack.blocks.panelBlocks.platformBlocks.PlatformBlockDE; +import net.adeptstack.blocks.panelBlocks.platformBlocks.PlatformBlockNL; +import net.adeptstack.blocks.LineBlock; import net.minecraft.world.level.block.*; import net.minecraft.world.level.material.MapColor; diff --git a/common/src/main/java/net/adeptstack/registry/TrainUtilitiesBuilderTransformers.java b/common/src/main/java/net/adeptstack/registry/TrainUtilitiesBuilderTransformers.java index 3f197ae..549afe9 100644 --- a/common/src/main/java/net/adeptstack/registry/TrainUtilitiesBuilderTransformers.java +++ b/common/src/main/java/net/adeptstack/registry/TrainUtilitiesBuilderTransformers.java @@ -3,23 +3,20 @@ import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTags; import com.simibubi.create.content.decoration.palettes.GlassPaneBlock; -import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorBlock; -import com.simibubi.create.foundation.data.AssetLookup; import com.tterrag.registrate.builders.BlockBuilder; import com.tterrag.registrate.util.entry.BlockEntry; import com.tterrag.registrate.util.nullness.NonNullUnaryOperator; -import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile; -import net.adeptstack.Blocks.Behaviour.DoorBlock.DoorBlockMovementBehaviour; -import net.adeptstack.Blocks.Behaviour.DoorBlock.DoorBlockMovingInteraction; -import net.adeptstack.Blocks.Behaviour.SlidingDoor.TrainSlidingDoorMovementBehaviour; -import net.adeptstack.Blocks.Behaviour.SlidingDoor.TrainSlidingDoorMovingInteraction; -import net.adeptstack.Blocks.PanelBlocks.IsoWallBlock; -import net.adeptstack.Blocks.PanelBlocks.PlatformBlocks.PlatformBlockCH; -import net.adeptstack.Core.Utils.TrainSlidingDoorProperties; -import net.adeptstack.Blocks.Doors.SlidingDoor.TrainSlidingDoorBlock; -import net.adeptstack.Blocks.LineBlock; -import net.adeptstack.Blocks.PanelBlocks.PlatformBlocks.PlatformBlockDE; -import net.adeptstack.Blocks.PanelBlocks.PlatformBlocks.PlatformBlockNL; +import net.adeptstack.behaviour.doorBlock.DoorBlockMovementBehaviour; +import net.adeptstack.behaviour.doorBlock.DoorBlockMovingInteraction; +import net.adeptstack.behaviour.slidingDoor.TrainSlidingDoorMovementBehaviour; +import net.adeptstack.behaviour.slidingDoor.TrainSlidingDoorMovingInteraction; +import net.adeptstack.blocks.panelBlocks.IsoWallBlock; +import net.adeptstack.blocks.panelBlocks.platformBlocks.PlatformBlockCH; +import net.adeptstack.utils.TrainSlidingDoorProperties; +import net.adeptstack.blocks.doors.slidingDoor.TrainSlidingDoorBlock; +import net.adeptstack.blocks.LineBlock; +import net.adeptstack.blocks.panelBlocks.platformBlocks.PlatformBlockDE; +import net.adeptstack.blocks.panelBlocks.platformBlocks.PlatformBlockNL; import net.minecraft.client.renderer.RenderType; import net.minecraft.sounds.SoundEvents; import net.minecraft.tags.BlockTags; diff --git a/common/src/main/java/net/adeptstack/Core/UI/Controls/BlockButton.java b/common/src/main/java/net/adeptstack/ui/controls/BlockButton.java similarity index 96% rename from common/src/main/java/net/adeptstack/Core/UI/Controls/BlockButton.java rename to common/src/main/java/net/adeptstack/ui/controls/BlockButton.java index 1c09b74..f29d58c 100644 --- a/common/src/main/java/net/adeptstack/Core/UI/Controls/BlockButton.java +++ b/common/src/main/java/net/adeptstack/ui/controls/BlockButton.java @@ -1,4 +1,4 @@ -package net.adeptstack.Core.UI.Controls; +package net.adeptstack.ui.controls; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.gui.GuiGraphics; @@ -7,7 +7,6 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; -import java.awt.*; import java.util.function.Consumer; public class BlockButton extends Button { diff --git a/common/src/main/java/net/adeptstack/Core/UI/Screens/ChangeDoorSoundScreen.java b/common/src/main/java/net/adeptstack/ui/screens/ChangeDoorSoundScreen.java similarity index 96% rename from common/src/main/java/net/adeptstack/Core/UI/Screens/ChangeDoorSoundScreen.java rename to common/src/main/java/net/adeptstack/ui/screens/ChangeDoorSoundScreen.java index 0014a69..2c9c508 100644 --- a/common/src/main/java/net/adeptstack/Core/UI/Screens/ChangeDoorSoundScreen.java +++ b/common/src/main/java/net/adeptstack/ui/screens/ChangeDoorSoundScreen.java @@ -1,9 +1,8 @@ -package net.adeptstack.Core.UI.Screens; +package net.adeptstack.ui.screens; -import com.mojang.text2speech.Narrator; -import net.adeptstack.Core.UI.Controls.BlockButton; -import net.adeptstack.Core.Utils.ScreenUtils.ToolTipUtils; -import net.adeptstack.Core.Utils.TrainSlidingDoorProperties; +import net.adeptstack.ui.controls.BlockButton; +import net.adeptstack.utils.screenUtils.ToolTipUtils; +import net.adeptstack.utils.TrainSlidingDoorProperties; import net.adeptstack.registry.TrainUtilitiesBuilderTransformers; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; diff --git a/common/src/main/java/net/adeptstack/Core/UI/Screens/PlatformBlockScreenBase.java b/common/src/main/java/net/adeptstack/ui/screens/PlatformBlockScreenBase.java similarity index 97% rename from common/src/main/java/net/adeptstack/Core/UI/Screens/PlatformBlockScreenBase.java rename to common/src/main/java/net/adeptstack/ui/screens/PlatformBlockScreenBase.java index 4d3e772..52208b6 100644 --- a/common/src/main/java/net/adeptstack/Core/UI/Screens/PlatformBlockScreenBase.java +++ b/common/src/main/java/net/adeptstack/ui/screens/PlatformBlockScreenBase.java @@ -1,7 +1,7 @@ -package net.adeptstack.Core.UI.Screens; +package net.adeptstack.ui.screens; -import net.adeptstack.Core.UI.Controls.BlockButton; -import net.adeptstack.Core.Utils.ScreenUtils.ToolTipUtils; +import net.adeptstack.ui.controls.BlockButton; +import net.adeptstack.utils.screenUtils.ToolTipUtils; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.screens.Screen; diff --git a/common/src/main/java/net/adeptstack/Core/UI/Screens/PlatformBlocks/PlatformBlockCHPlacementScreen.java b/common/src/main/java/net/adeptstack/ui/screens/platformBlocks/PlatformBlockCHPlacementScreen.java similarity index 80% rename from common/src/main/java/net/adeptstack/Core/UI/Screens/PlatformBlocks/PlatformBlockCHPlacementScreen.java rename to common/src/main/java/net/adeptstack/ui/screens/platformBlocks/PlatformBlockCHPlacementScreen.java index 3adf21f..c4cb829 100644 --- a/common/src/main/java/net/adeptstack/Core/UI/Screens/PlatformBlocks/PlatformBlockCHPlacementScreen.java +++ b/common/src/main/java/net/adeptstack/ui/screens/platformBlocks/PlatformBlockCHPlacementScreen.java @@ -1,6 +1,6 @@ -package net.adeptstack.Core.UI.Screens.PlatformBlocks; +package net.adeptstack.ui.screens.platformBlocks; -import net.adeptstack.Core.UI.Screens.PlatformBlockScreenBase; +import net.adeptstack.ui.screens.PlatformBlockScreenBase; import net.minecraft.world.level.block.state.properties.IntegerProperty; import java.util.function.Consumer; diff --git a/common/src/main/java/net/adeptstack/Core/UI/Screens/PlatformBlocks/PlatformBlockDEPlacementScreen.java b/common/src/main/java/net/adeptstack/ui/screens/platformBlocks/PlatformBlockDEPlacementScreen.java similarity index 80% rename from common/src/main/java/net/adeptstack/Core/UI/Screens/PlatformBlocks/PlatformBlockDEPlacementScreen.java rename to common/src/main/java/net/adeptstack/ui/screens/platformBlocks/PlatformBlockDEPlacementScreen.java index db71abb..19f2dc7 100644 --- a/common/src/main/java/net/adeptstack/Core/UI/Screens/PlatformBlocks/PlatformBlockDEPlacementScreen.java +++ b/common/src/main/java/net/adeptstack/ui/screens/platformBlocks/PlatformBlockDEPlacementScreen.java @@ -1,6 +1,6 @@ -package net.adeptstack.Core.UI.Screens.PlatformBlocks; +package net.adeptstack.ui.screens.platformBlocks; -import net.adeptstack.Core.UI.Screens.PlatformBlockScreenBase; +import net.adeptstack.ui.screens.PlatformBlockScreenBase; import net.minecraft.world.level.block.state.properties.IntegerProperty; import java.util.function.Consumer; diff --git a/common/src/main/java/net/adeptstack/Core/UI/Screens/PlatformBlocks/PlatformBlockNLPlacementScreen.java b/common/src/main/java/net/adeptstack/ui/screens/platformBlocks/PlatformBlockNLPlacementScreen.java similarity index 80% rename from common/src/main/java/net/adeptstack/Core/UI/Screens/PlatformBlocks/PlatformBlockNLPlacementScreen.java rename to common/src/main/java/net/adeptstack/ui/screens/platformBlocks/PlatformBlockNLPlacementScreen.java index 9729ab9..95d5f42 100644 --- a/common/src/main/java/net/adeptstack/Core/UI/Screens/PlatformBlocks/PlatformBlockNLPlacementScreen.java +++ b/common/src/main/java/net/adeptstack/ui/screens/platformBlocks/PlatformBlockNLPlacementScreen.java @@ -1,6 +1,6 @@ -package net.adeptstack.Core.UI.Screens.PlatformBlocks; +package net.adeptstack.ui.screens.platformBlocks; -import net.adeptstack.Core.UI.Screens.PlatformBlockScreenBase; +import net.adeptstack.ui.screens.PlatformBlockScreenBase; import net.minecraft.world.level.block.state.properties.IntegerProperty; import java.util.function.Consumer; diff --git a/common/src/main/java/net/adeptstack/Core/Utils/ScreenUtils/PlacementUtils.java b/common/src/main/java/net/adeptstack/utils/PlacementUtils.java similarity index 94% rename from common/src/main/java/net/adeptstack/Core/Utils/ScreenUtils/PlacementUtils.java rename to common/src/main/java/net/adeptstack/utils/PlacementUtils.java index 8f3aae0..492a1b1 100644 --- a/common/src/main/java/net/adeptstack/Core/Utils/ScreenUtils/PlacementUtils.java +++ b/common/src/main/java/net/adeptstack/utils/PlacementUtils.java @@ -1,4 +1,4 @@ -package net.adeptstack.Core.Utils.ScreenUtils; +package net.adeptstack.utils; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/common/src/main/java/net/adeptstack/Core/Utils/TrainSlidingDoorProperties.java b/common/src/main/java/net/adeptstack/utils/TrainSlidingDoorProperties.java similarity index 94% rename from common/src/main/java/net/adeptstack/Core/Utils/TrainSlidingDoorProperties.java rename to common/src/main/java/net/adeptstack/utils/TrainSlidingDoorProperties.java index 08710c1..a3e0aa2 100644 --- a/common/src/main/java/net/adeptstack/Core/Utils/TrainSlidingDoorProperties.java +++ b/common/src/main/java/net/adeptstack/utils/TrainSlidingDoorProperties.java @@ -1,4 +1,4 @@ -package net.adeptstack.Core.Utils; +package net.adeptstack.utils; import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvents; diff --git a/common/src/main/java/net/adeptstack/Core/Enums/EBlockPlacePosition.java b/common/src/main/java/net/adeptstack/utils/enums/EBlockPlacePosition.java similarity index 95% rename from common/src/main/java/net/adeptstack/Core/Enums/EBlockPlacePosition.java rename to common/src/main/java/net/adeptstack/utils/enums/EBlockPlacePosition.java index 0db7ae6..adc31b8 100644 --- a/common/src/main/java/net/adeptstack/Core/Enums/EBlockPlacePosition.java +++ b/common/src/main/java/net/adeptstack/utils/enums/EBlockPlacePosition.java @@ -1,4 +1,4 @@ -package net.adeptstack.Core.Enums; +package net.adeptstack.utils.enums; import net.minecraft.util.StringRepresentable; diff --git a/common/src/main/java/net/adeptstack/Core/Enums/EMultiBlockPart.java b/common/src/main/java/net/adeptstack/utils/enums/EMultiBlockPart.java similarity index 94% rename from common/src/main/java/net/adeptstack/Core/Enums/EMultiBlockPart.java rename to common/src/main/java/net/adeptstack/utils/enums/EMultiBlockPart.java index f164f27..68477cf 100644 --- a/common/src/main/java/net/adeptstack/Core/Enums/EMultiBlockPart.java +++ b/common/src/main/java/net/adeptstack/utils/enums/EMultiBlockPart.java @@ -1,4 +1,4 @@ -package net.adeptstack.Core.Enums; +package net.adeptstack.utils.enums; import net.minecraft.util.StringRepresentable; diff --git a/common/src/main/java/net/adeptstack/Core/Utils/ScreenUtils/TextureNames.java b/common/src/main/java/net/adeptstack/utils/screenUtils/TextureNames.java similarity index 98% rename from common/src/main/java/net/adeptstack/Core/Utils/ScreenUtils/TextureNames.java rename to common/src/main/java/net/adeptstack/utils/screenUtils/TextureNames.java index 30848c8..8be9113 100644 --- a/common/src/main/java/net/adeptstack/Core/Utils/ScreenUtils/TextureNames.java +++ b/common/src/main/java/net/adeptstack/utils/screenUtils/TextureNames.java @@ -1,4 +1,4 @@ -package net.adeptstack.Core.Utils.ScreenUtils; +package net.adeptstack.utils.screenUtils; public class TextureNames { public static String GetNLPlatformBlockTextureName(int variant) { diff --git a/common/src/main/java/net/adeptstack/Core/Utils/ScreenUtils/ToolTipUtils.java b/common/src/main/java/net/adeptstack/utils/screenUtils/ToolTipUtils.java similarity index 98% rename from common/src/main/java/net/adeptstack/Core/Utils/ScreenUtils/ToolTipUtils.java rename to common/src/main/java/net/adeptstack/utils/screenUtils/ToolTipUtils.java index 0ddbfa9..fb982ec 100644 --- a/common/src/main/java/net/adeptstack/Core/Utils/ScreenUtils/ToolTipUtils.java +++ b/common/src/main/java/net/adeptstack/utils/screenUtils/ToolTipUtils.java @@ -1,4 +1,4 @@ -package net.adeptstack.Core.Utils.ScreenUtils; +package net.adeptstack.utils.screenUtils; public class ToolTipUtils { public static String GetSoundName(int variant) { diff --git a/common/src/main/resources/assets/trainutilities/lang/de_de.json b/common/src/main/resources/assets/trainutilities/lang/de_de.json index f58807d..19859be 100644 --- a/common/src/main/resources/assets/trainutilities/lang/de_de.json +++ b/common/src/main/resources/assets/trainutilities/lang/de_de.json @@ -245,7 +245,7 @@ "advancement.trainutilities.incomplete_prototype_doors": "Ein erster Entwurf!", "advancement.trainutilities.incomplete_prototype_doors.description": "Sie quietscht und klemmt.", "advancement.trainutilities.door_ingrediants": "Komponentenlager", - "advancement.trainutilities.door_ingrediants.description": "Besitze alle 4 Basis Tür Komponenten", + "advancement.trainutilities.door_ingrediants.description": "Besitze mindestens eine Basis Komponente für Türen", "itemGroup.trainutilities.trainutils_tab": "Create: TrainUtilities", "itemGroup.trainutilities.doors_tab": "Create: TrainUtilities - Türen", diff --git a/common/src/main/resources/assets/trainutilities/lang/en_us.json b/common/src/main/resources/assets/trainutilities/lang/en_us.json index 29ad13e..21f0ba5 100644 --- a/common/src/main/resources/assets/trainutilities/lang/en_us.json +++ b/common/src/main/resources/assets/trainutilities/lang/en_us.json @@ -2,7 +2,7 @@ "block.trainutilities.frameless_glass": "Frameless Glass", "block.trainutilities.top_redline_block": "DB IC(E) Line Block (Top)", "block.trainutilities.bottom_redline_block": "DB IC(E) Line Block (Bottom)", - "block.trainutilities.leftsloped_redline_block": "DB IC(E) Sloped Line Block (left)", + "block.trainutilities.leftsloped_redline_block": "DB IC(E) Sloped Line Block (Left)", "block.trainutilities.rightsloped_redline_block": "DB IC(E) Sloped Line Block (Right)", "block.trainutilities.pkp_ic_top_green_line_block": "PKP Intercity Line Block (Top, Green)", "block.trainutilities.pkp_ic_top_yellow_line_block": "PKP Intercity Line Block (Top, Yellow)", @@ -13,7 +13,7 @@ "block.trainutilities.pkp_block_white": "PKP Intercity Block White", "block.trainutilities.pkp_block_blue": "PKP Intercity Block Blue", "block.trainutilities.cis_amendorf_block_1": "CIS Amendorf Block (Type 1)", - "block.trainutilities.cis_amendorf_block_2": "CIS Amendorf Block (Typ 2)", + "block.trainutilities.cis_amendorf_block_2": "CIS Amendorf Block (Type 2)", "block.trainutilities.iso_wall_block": "Noise Isolation Wall", "block.trainutilities.iso_wall_block_green": "Noise Isolation Wall (Green)", "block.trainutilities.frameless_glass_pane": "Frameless Glass Pane", @@ -245,7 +245,7 @@ "advancement.trainutilities.incomplete_prototype_doors": "A first Draft!", "advancement.trainutilities.incomplete_prototype_doors.description": "It squeaks and jams.", "advancement.trainutilities.door_ingrediants": "Component Warehouse", - "advancement.trainutilities.door_ingrediants.description": "Own all 4 basic door components", + "advancement.trainutilities.door_ingrediants.description": "Own at least one basic door component", "itemGroup.trainutilities.trainutils_tab": "Create: TrainUtilities", "itemGroup.trainutilities.doors_tab": "Create: TrainUtilities - Doors", diff --git a/common/src/main/resources/data/trainutilities/advancements/door_ingrediants.json b/common/src/main/resources/data/trainutilities/advancements/door_ingrediants.json index bf0bc1b..4c46fdc 100644 --- a/common/src/main/resources/data/trainutilities/advancements/door_ingrediants.json +++ b/common/src/main/resources/data/trainutilities/advancements/door_ingrediants.json @@ -21,10 +21,7 @@ "conditions": { "items": [ { - "item": "trainutilities:processing_unit", - "item": "trainutilities:sound_unit", - "item": "trainutilities:transistor", - "item": "trainutilities:rubber_seal" + "tag": "trainutilities:door_ingrediants" } ] } diff --git a/common/src/main/resources/data/trainutilities/advancements/incomplete_prototype_door.json b/common/src/main/resources/data/trainutilities/advancements/incomplete_prototype_door.json index a235056..5f53d36 100644 --- a/common/src/main/resources/data/trainutilities/advancements/incomplete_prototype_door.json +++ b/common/src/main/resources/data/trainutilities/advancements/incomplete_prototype_door.json @@ -22,8 +22,7 @@ "conditions": { "items": [ { - "item": "trainutilities:incomplete_prototype_door_sf", - "item": "trainutilities:incomplete_prototype_door_db" + "tag": "trainutilities:iptd" } ] } diff --git a/common/src/main/resources/data/trainutilities/tags/items/door_ingrediants.json b/common/src/main/resources/data/trainutilities/tags/items/door_ingrediants.json new file mode 100644 index 0000000..4b04112 --- /dev/null +++ b/common/src/main/resources/data/trainutilities/tags/items/door_ingrediants.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "trainutilities:processing_unit", + "trainutilities:sound_unit", + "trainutilities:transistor", + "trainutilities:rubber_seal" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/trainutilities/tags/items/iptd.json b/common/src/main/resources/data/trainutilities/tags/items/iptd.json new file mode 100644 index 0000000..19207bc --- /dev/null +++ b/common/src/main/resources/data/trainutilities/tags/items/iptd.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "trainutilities:incomplete_prototype_door_sf", + "trainutilities:incomplete_prototype_door_db" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/trainutilities.mixins.json b/common/src/main/resources/trainutilities.mixins.json index 4f1f07d..992683c 100644 --- a/common/src/main/resources/trainutilities.mixins.json +++ b/common/src/main/resources/trainutilities.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "net.adeptstack.Mixin", + "package": "net.adeptstack.mixin", "compatibilityLevel": "JAVA_17", "minVersion": "0.8", "client": [ diff --git a/gradle.properties b/gradle.properties index 2cdf997..31269fb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx4G org.gradle.parallel=true # Mod properties -mod_version = 2.3.1 +mod_version = 3.0.0 maven_group = net.adeptstack archives_name = trainutilities enabled_platforms = fabric,forge diff --git a/readme.md b/readme.md index 489996b..0fe805b 100644 --- a/readme.md +++ b/readme.md @@ -1,44 +1,54 @@ -# Create: TrainUtilities -Modrinth Downloads -CurseForge Downloads + Mod that adds custom sliding doors with realistic opening & closing sounds and station blocks, and also building blocks for stations and trains. -## Discord -[![Discord](https://discord.com/api/guilds/1248636479627071488/widget.png?style=banner2)](https://discord.gg/DkcprwueFj) + + + -Feel free to join our discord to see development updates and give feedback! +## Dependencies +- [Create](https://modrinth.com/mod/create) / [Create Fabric](https://modrinth.com/mod/create-fabric) +- [Architectury API](https://modrinth.com/mod/architectury-api) ## Features -### New sliding doors with sounds on contraptions: -[demostration video: https://www.youtube.com/watch?v=6uMUcU0TmNM](https://www.youtube.com/watch?v=6uMUcU0TmNM) +### Overview Video + -![more create styled doors](https://cdn.modrinth.com/data/cached_images/7839fb0d04de637d280c055272f1f0bb20f8619b.png) -> textures by Vinicius M ---- -### All added doors -![All Train doors](https://cdn.modrinth.com/data/cached_images/289576346317cf93070cf2383e2253da2ea423f5.png) +
-### Platform blocks: -![Platform blocks](https://cdn.modrinth.com/data/cached_images/66dcc56b4662d3f1e43335655659a9e168ce97bb.png) -- Left: Dutch signs (Textures by OneLink) -- Right: German signs +### New sliding doors +
+img_one -and a few other things. +img_two +
+... and MORE! +
-## Dependencies -- [Create v0.5.1f or higher](https://modrinth.com/mod/create) -- [Architectury API (v9.2.14-1.20.1)](https://modrinth.com/mod/architectury-api) +### Platform Blocks +
+img_one + +img_two +
+... and MORE! +
+ +### More Features +- Opening & Closing sounds +- auto closing doors +- doors can be controlled on all carriages +- and more! ## Languages -- English (100%) -- German (100%) +- English +- German - Spanish (by Timanfour) +- Czech (by Panzimy) +- Russian (by Best-Jaro) ## Important! -You should always back up your world before installing a mod update to protect your world from damage. Especially alpha releases may contain critical bugs! +You should always back up your world before installing a mod update to protect your world from damage. -## Special thanks to -- **MrJulsen** -- **OneLink** -- **Vinicius M** \ No newline at end of file +## Credits +[Credits](https://github.com/ProgrammerLP/Create-Trainutilities/wiki/Credits) \ No newline at end of file