Skip to content

Commit 4e7ef08

Browse files
ProgrammerLPProgrammerLP
authored
Merge pull request #14 from ProgrammerLP/1.20.1.dev
v3.0.0
2 parents 1e2ef8b + 5f6548d commit 4e7ef08

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+182
-194
lines changed

‎common/src/main/java/net/adeptstack/Core/Network/ModNetwork.java‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎common/src/main/java/net/adeptstack/Main.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,11 @@
55
import com.simibubi.create.foundation.item.KineticStats;
66
import com.simibubi.create.foundation.item.TooltipHelper;
77
import com.simibubi.create.foundation.item.TooltipModifier;
8-
import com.tterrag.registrate.providers.ProviderType;
98
import dev.architectury.platform.Platform;
10-
import net.adeptstack.Blocks.Doors.SlidingDoor.TrainSlidingDoorBlock;
11-
import net.adeptstack.Core.Network.ModNetwork;
9+
import net.adeptstack.blocks.doors.slidingDoor.TrainSlidingDoorBlock;
10+
import net.adeptstack.network.ModNetwork;
1211
import net.adeptstack.registry.*;
1312
import net.fabricmc.api.EnvType;
14-
import net.minecraft.data.DataGenerator;
15-
import net.minecraft.data.DataProvider;
1613
import net.minecraft.resources.ResourceLocation;
1714
import net.minecraft.world.item.BlockItem;
1815
import net.minecraft.world.item.Item;

‎common/src/main/java/net/adeptstack/Blocks/Behaviour/DoorBlock/DoorBlockMovementBehaviour.java‎ renamed to ‎common/src/main/java/net/adeptstack/behaviour/doorBlock/DoorBlockMovementBehaviour.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.adeptstack.Blocks.Behaviour.DoorBlock;
1+
package net.adeptstack.behaviour.doorBlock;
22

33
import com.simibubi.create.content.contraptions.Contraption;
44
import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
@@ -11,10 +11,6 @@
1111
import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
1212
import com.simibubi.create.content.trains.station.GlobalStation;
1313
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
14-
import com.simibubi.create.foundation.utility.animation.LerpedFloat;
15-
import net.adeptstack.Blocks.Doors.SlidingDoor.TrainSlidingDoorBlock;
16-
import net.adeptstack.Blocks.Doors.SlidingDoor.TrainSlidingDoorBlockEntity;
17-
import net.adeptstack.registry.TrainUtilitiesBuilderTransformers;
1814
import net.minecraft.core.BlockPos;
1915
import net.minecraft.core.Direction;
2016
import net.minecraft.resources.ResourceKey;
@@ -24,16 +20,12 @@
2420
import net.minecraft.sounds.SoundSource;
2521
import net.minecraft.world.level.Level;
2622
import net.minecraft.world.level.block.DoorBlock;
27-
import net.minecraft.world.level.block.entity.BlockEntity;
2823
import net.minecraft.world.level.block.state.BlockState;
29-
import net.minecraft.world.level.block.state.properties.DoorHingeSide;
3024
import net.minecraft.world.level.block.state.properties.DoubleBlockHalf;
3125
import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
3226
import net.minecraft.world.phys.Vec3;
3327

3428
import java.lang.ref.WeakReference;
35-
import java.util.Map;
36-
import java.util.TimerTask;
3729

3830
public class DoorBlockMovementBehaviour implements MovementBehaviour {
3931

‎common/src/main/java/net/adeptstack/Blocks/Behaviour/DoorBlock/DoorBlockMovingInteraction.java‎ renamed to ‎common/src/main/java/net/adeptstack/behaviour/doorBlock/DoorBlockMovingInteraction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package net.adeptstack.Blocks.Behaviour.DoorBlock;
1+
package net.adeptstack.behaviour.doorBlock;
22

33
import com.simibubi.create.content.contraptions.Contraption;
44
import com.simibubi.create.content.contraptions.behaviour.SimpleBlockMovingInteraction;
5-
import net.adeptstack.Blocks.Doors.SlidingDoor.TrainSlidingDoorBlock;
5+
import net.adeptstack.blocks.doors.slidingDoor.TrainSlidingDoorBlock;
66
import net.minecraft.core.BlockPos;
77
import net.minecraft.core.Direction;
88
import net.minecraft.sounds.SoundEvent;

‎common/src/main/java/net/adeptstack/Blocks/Behaviour/SlidingDoor/TrainSlidingDoorMovementBehaviour.java‎ renamed to ‎common/src/main/java/net/adeptstack/behaviour/slidingDoor/TrainSlidingDoorMovementBehaviour.java‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.adeptstack.Blocks.Behaviour.SlidingDoor;
1+
package net.adeptstack.behaviour.slidingDoor;
22

33
import com.simibubi.create.content.contraptions.Contraption;
44
import com.simibubi.create.content.contraptions.behaviour.MovementBehaviour;
@@ -8,15 +8,13 @@
88
import com.simibubi.create.content.decoration.slidingDoor.DoorControl;
99
import com.simibubi.create.content.decoration.slidingDoor.DoorControlBehaviour;
1010
import com.simibubi.create.content.trains.entity.Carriage;
11-
import com.simibubi.create.content.trains.entity.CarriageContraption;
1211
import com.simibubi.create.content.trains.entity.CarriageContraptionEntity;
1312
import com.simibubi.create.content.trains.station.GlobalStation;
1413
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
1514
import com.simibubi.create.foundation.utility.animation.LerpedFloat;
16-
import net.adeptstack.Blocks.Doors.SlidingDoor.TrainSlidingDoorBlock;
17-
import net.adeptstack.Core.Client.ClientWrapper;
18-
import net.adeptstack.Core.Utils.TrainSlidingDoorProperties;
19-
import net.adeptstack.Blocks.Doors.SlidingDoor.TrainSlidingDoorBlockEntity;
15+
import net.adeptstack.blocks.doors.slidingDoor.TrainSlidingDoorBlock;
16+
import net.adeptstack.utils.TrainSlidingDoorProperties;
17+
import net.adeptstack.blocks.doors.slidingDoor.TrainSlidingDoorBlockEntity;
2018
import net.adeptstack.registry.TrainUtilitiesBuilderTransformers;
2119
import net.minecraft.core.BlockPos;
2220
import net.minecraft.core.Direction;
@@ -35,8 +33,6 @@
3533

3634
import java.lang.ref.WeakReference;
3735
import java.util.Map;
38-
import java.util.Timer;
39-
import java.util.TimerTask;
4036

4137
public class TrainSlidingDoorMovementBehaviour implements MovementBehaviour {
4238

@@ -61,7 +57,7 @@ public void tick(MovementContext context) {
6157
int ticksOpen = context.data.getInt("OpenTicks");
6258
ticksOpen++;
6359
context.data.putInt("OpenTicks", ticksOpen);
64-
if (ticksOpen > 240) {
60+
if (ticksOpen > 180) {
6561
tickClose(context, true);
6662
context.data.putInt("OpenTicks", 0);
6763
}

‎common/src/main/java/net/adeptstack/Blocks/Behaviour/SlidingDoor/TrainSlidingDoorMovingInteraction.java‎ renamed to ‎common/src/main/java/net/adeptstack/behaviour/slidingDoor/TrainSlidingDoorMovingInteraction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package net.adeptstack.Blocks.Behaviour.SlidingDoor;
1+
package net.adeptstack.behaviour.slidingDoor;
22

33
import com.simibubi.create.content.contraptions.Contraption;
44
import com.simibubi.create.content.contraptions.behaviour.SimpleBlockMovingInteraction;
5-
import net.adeptstack.Blocks.Doors.SlidingDoor.TrainSlidingDoorBlock;
5+
import net.adeptstack.blocks.doors.slidingDoor.TrainSlidingDoorBlock;
66
import net.minecraft.core.BlockPos;
77
import net.minecraft.core.Direction;
88
import net.minecraft.sounds.SoundEvent;

‎common/src/main/java/net/adeptstack/Blocks/LineBlock.java‎ renamed to ‎common/src/main/java/net/adeptstack/blocks/LineBlock.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.adeptstack.Blocks;
1+
package net.adeptstack.blocks;
22

33
import net.minecraft.core.Direction;
44
import net.minecraft.world.item.context.BlockPlaceContext;

‎common/src/main/java/net/adeptstack/Blocks/Doors/SlidingDoor/TrainSlidingDoorBlock.java‎ renamed to ‎common/src/main/java/net/adeptstack/blocks/doors/slidingDoor/TrainSlidingDoorBlock.java‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
1-
package net.adeptstack.Blocks.Doors.SlidingDoor;
1+
package net.adeptstack.blocks.doors.slidingDoor;
22

33
import com.simibubi.create.content.contraptions.behaviour.MovementContext;
44
import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorBlock;
5-
import com.simibubi.create.foundation.item.ItemDescription;
6-
import com.simibubi.create.foundation.item.KineticStats;
7-
import com.simibubi.create.foundation.item.TooltipHelper;
8-
import com.simibubi.create.foundation.item.TooltipModifier;
9-
import net.adeptstack.Core.Client.ClientWrapper;
10-
import net.adeptstack.Core.Utils.ScreenUtils.PlacementUtils;
5+
import net.adeptstack.client.ClientWrapper;
6+
import net.adeptstack.utils.PlacementUtils;
117
import net.adeptstack.registry.ModBlockEntities;
128
import net.minecraft.core.BlockPos;
139
import net.minecraft.core.Direction;
1410
import net.minecraft.world.InteractionHand;
1511
import net.minecraft.world.InteractionResult;
1612
import net.minecraft.world.entity.player.Player;
17-
import net.minecraft.world.item.BlockItem;
18-
import net.minecraft.world.item.Item;
1913
import net.minecraft.world.level.Level;
2014
import net.minecraft.world.level.block.Block;
2115
import net.minecraft.world.level.block.entity.BlockEntityType;
@@ -26,9 +20,6 @@
2620
import net.minecraft.world.level.block.state.properties.IntegerProperty;
2721
import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
2822
import net.minecraft.world.phys.BlockHitResult;
29-
import org.jetbrains.annotations.Nullable;
30-
31-
import static net.adeptstack.Main.REGISTRATE;
3223

3324
public class TrainSlidingDoorBlock extends SlidingDoorBlock {
3425

‎common/src/main/java/net/adeptstack/Blocks/Doors/SlidingDoor/TrainSlidingDoorBlockEntity.java‎ renamed to ‎common/src/main/java/net/adeptstack/blocks/doors/slidingDoor/TrainSlidingDoorBlockEntity.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
package net.adeptstack.Blocks.Doors.SlidingDoor;
1+
package net.adeptstack.blocks.doors.slidingDoor;
22

33
import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorBlockEntity;
44
import com.simibubi.create.foundation.utility.animation.LerpedFloat;
55
import net.minecraft.core.BlockPos;
6-
import net.minecraft.world.level.block.DoorBlock;
76
import net.minecraft.world.level.block.entity.BlockEntityType;
87
import net.minecraft.world.level.block.state.BlockState;
98

‎common/src/main/java/net/adeptstack/Blocks/Doors/SlidingDoor/TrainSlidingDoorBlockRenderer.java‎ renamed to ‎common/src/main/java/net/adeptstack/blocks/doors/slidingDoor/TrainSlidingDoorBlockRenderer.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
package net.adeptstack.Blocks.Doors.SlidingDoor;
1+
package net.adeptstack.blocks.doors.slidingDoor;
22

33
import com.jozufozu.flywheel.core.PartialModel;
44
import com.mojang.blaze3d.vertex.PoseStack;
55
import com.mojang.blaze3d.vertex.VertexConsumer;
6-
import com.simibubi.create.AllPartialModels;
7-
import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorBlock;
86
import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorBlockEntity;
97
import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorRenderer;
108
import com.simibubi.create.foundation.render.CachedBufferer;

0 commit comments

Comments
 (0)