mirror of
https://github.com/Creators-of-Create/Create.git
synced 2024-05-19 12:04:41 +02:00
e5c6ca157c
commit 053dd09df6c426ab5e570f42a1edb5df3d0fbd01 Merge: 6d1e1c71decc645eba
Author: simibubi <31564874+simibubi@users.noreply.github.com> Date: Tue May 9 18:22:42 2023 +0200 Merge branch '1.18/api' of https://github.com/Layers-of-Railways/Create into pr/4692 commitecc645eba7
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Tue May 9 11:24:11 2023 +0100 Implemented support for creating and removing individual blockstate models commit 6d1e1c71de7ce20f6fd9fc8ed4ed9bdd1072829a Author: simibubi <31564874+simibubi@users.noreply.github.com> Date: Tue May 9 12:16:54 2023 +0200 Less error logging when migrating old worlds commit205e47352e
Author: techno-sam <linux.techno.sam@gmail.com> Date: Mon May 8 21:02:19 2023 -0700 Fix up ItemOutline commit6cf204f6af
Merge:fe049bc77
2e3c906ce
Author: techno-sam <linux.techno.sam@gmail.com> Date: Mon May 8 20:28:56 2023 -0700 Merge remote-tracking branch 'upstream/mc1.18/dev' into 1.18/api # Conflicts: # src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageCouplingRenderer.java commitfe049bc771
Author: techno-sam <linux.techno.sam@gmail.com> Date: Mon May 8 20:26:16 2023 -0700 Revert "Revert "Rewrite outline buffering"" This reverts commit726bfaf0
commit435b4c1c16
Author: techno-sam <linux.techno.sam@gmail.com> Date: Mon May 8 20:20:23 2023 -0700 Clean up last bits of upside down rendering commit662da6bab1
Merge:122fe77af
d83285e8a
Author: techno-sam <linux.techno.sam@gmail.com> Date: Mon May 8 20:16:32 2023 -0700 Merge remote-tracking branch 'origin/1.18/api' into 1.18/api # Conflicts: # src/main/java/com/simibubi/create/content/logistics/trains/StandardBogeyRenderer.java commit122fe77afa
Author: techno-sam <linux.techno.sam@gmail.com> Date: Mon May 8 20:15:46 2023 -0700 Fix up upside down rendering commitd83285e8a4
Merge:00e953a58
cdb0ad210
Author: techno-sam <77073745+techno-sam@users.noreply.github.com> Date: Sun May 7 07:02:18 2023 -0700 Merge pull request #3 from Layers-of-Railways/1.18/bogey-api Cleanup cycle groups and unused imports commitcdb0ad210b
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun May 7 10:15:47 2023 +0100 Fixed merge artifact commit457d5f33ed
Merge:4e4e227a3
00e953a58
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun May 7 10:14:07 2023 +0100 Merge remote-tracking branch 'origin/1.18/api' into 1.18/api commit00e953a585
Merge:1e4d5504e
a7a25896c
Author: Rabbitminers <79579164+Rabbitminers@users.noreply.github.com> Date: Sun May 7 10:13:49 2023 +0100 Merge pull request #2 from Rabbitminers/mc1.18/dev Added Return Values and Small Cleanup commita7a25896c1
Merge:7622128be
1e4d5504e
Author: Rabbitminers <79579164+Rabbitminers@users.noreply.github.com> Date: Sun May 7 10:13:40 2023 +0100 Merge branch '1.18/api' into mc1.18/dev commit4e4e227a35
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun May 7 10:10:30 2023 +0100 Cleanup to cycle groups commitaa94fc97d1
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun May 7 09:50:50 2023 +0100 Removed unused import of Railways commit7622128bec
Merge:81eeadb85
d52065808
Author: Rabbitminers <79579164+Rabbitminers@users.noreply.github.com> Date: Sun May 7 09:11:59 2023 +0100 Merge branch 'Layers-of-Railways:mc1.18/dev' into mc1.18/dev commit1e4d5504ee
Author: techno-sam <linux.techno.sam@gmail.com> Date: Sat May 6 18:03:39 2023 -0700 Don't revert non-buggy changes commitb306cf2124
Author: techno-sam <linux.techno.sam@gmail.com> Date: Sat May 6 18:00:59 2023 -0700 Take materials into consideration when trains pathfind commitfca02ae4bf
Author: techno-sam <linux.techno.sam@gmail.com> Date: Sat May 6 10:25:51 2023 -0700 Add materials to track graph commit726bfaf0b5
Author: techno-sam <linux.techno.sam@gmail.com> Date: Fri May 5 21:16:49 2023 -0700 Revert "Rewrite outline buffering" This reverts commitd4106d545b
. commit171897bed2
Author: techno-sam <linux.techno.sam@gmail.com> Date: Fri May 5 20:55:25 2023 -0700 Fix up style cycling commitcbd0cf20da
Author: techno-sam <linux.techno.sam@gmail.com> Date: Fri May 5 07:32:06 2023 -0700 clean up nether portal carriage handling commitd556f08876
Author: techno-sam <linux.techno.sam@gmail.com> Date: Fri May 5 07:06:02 2023 -0700 upside down bogeys work in nether portals fixed coupling anchor offsets commitda26c0ccbf
Author: techno-sam <linux.techno.sam@gmail.com> Date: Thu May 4 09:32:53 2023 -0700 working on upside down bogeys in nether portals commit81eeadb853
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Mon May 1 16:15:28 2023 +0100 Small cleanup commitc7e9df973c
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Mon May 1 16:13:51 2023 +0100 Fixed issue raised in #1 commit2f285b6eb7
Author: techno-sam <linux.techno.sam@gmail.com> Date: Mon May 1 08:13:27 2023 -0700 add data gen commit206de01311
Merge:e91753a33
6564f4fa7
Author: techno-sam <77073745+techno-sam@users.noreply.github.com> Date: Mon May 1 06:49:21 2023 -0700 Merge pull request #1 from Rabbitminers/mc1.18/dev Bogey API commit6564f4fa73
Merge:e5d759582
e91753a33
Author: Rabbitminers <79579164+Rabbitminers@users.noreply.github.com> Date: Mon May 1 10:40:32 2023 +0100 Merge branch '1.18/api' into mc1.18/dev commite5d7595822
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Mon May 1 10:09:03 2023 +0100 Connected Custom Bogey Particle Types To CarriageParticles commite91753a33c
Author: techno-sam <linux.techno.sam@gmail.com> Date: Sun Apr 30 19:51:26 2023 -0700 Fix up some problems commit9815f1490f
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 30 21:12:43 2023 +0100 Implemented default data when shifting styles commitda30e78815
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 30 21:12:14 2023 +0100 Added Particles To Bogey Style (And Respective Builder) commit08c000b8ba
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 30 21:01:19 2023 +0100 Added Backup Rendering If A Size Is Not Present commit2b76e8d7b3
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 30 21:00:40 2023 +0100 Added Common Renderer To Remove Function commit411ec36f57
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 30 20:59:50 2023 +0100 Added Display Name To Standard Bogey Style commit112306d5d4
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 30 20:59:30 2023 +0100 Displayed new style name when changing betweeen them commit5634670b27
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 30 20:06:00 2023 +0100 General Cleanup commit0f7a8b7b24
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 30 20:05:50 2023 +0100 Implemented Changes To Remaining Classes commit8aedc00f96
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 30 20:02:06 2023 +0100 Removed Bogey Style Handling From Registrate commitedf8079abf
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 30 20:01:40 2023 +0100 Removed Unused Registry Handling commit6a185c4e72
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 30 20:01:16 2023 +0100 Refactored Bogey Sizes commite10d07ddc3
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 30 20:01:00 2023 +0100 Overhauled Bogey Style commit74d98a2ad5
Merge:e629d02f5
4ebcf8201
Author: techno-sam <77073745+techno-sam@users.noreply.github.com> Date: Sun Apr 23 07:16:33 2023 -0700 Merge branch 'Creators-of-Create:mc1.18/dev' into 1.18/api commite629d02f50
Author: techno-sam <linux.techno.sam@gmail.com> Date: Sun Apr 9 07:18:22 2023 -0700 Track API Clean up code a bit commitd9ce6ce995
Author: techno-sam <linux.techno.sam@gmail.com> Date: Sun Apr 9 07:14:46 2023 -0700 Track API? Fix placement commit7fbf08ba54
Author: techno-sam <linux.techno.sam@gmail.com> Date: Sat Apr 8 11:11:24 2023 -0700 Track API? Fix up some placement issues commit35644f1434
Author: techno-sam <linux.techno.sam@gmail.com> Date: Sat Apr 8 08:11:13 2023 -0700 Track API maybe? Datagen Seems to be working commitf7c56b867a
Author: techno-sam <linux.techno.sam@gmail.com> Date: Thu Apr 6 21:24:31 2023 -0700 Track API maybe? Fix build - broken generic Not yet tested, but it is progress commit2a59fd7e8a
Author: techno-sam <linux.techno.sam@gmail.com> Date: Thu Apr 6 21:13:54 2023 -0700 Track API maybe? Not yet tested, but it is progress commit5ba30d6a85
Merge:e4e5ac1c4
c2977bbff
Author: techno-sam <77073745+techno-sam@users.noreply.github.com> Date: Thu Apr 6 17:10:39 2023 -0700 Merge branch 'Creators-of-Create:mc1.18/dev' into 1.18/api commitd52065808c
Merge:e4e5ac1c4
c2977bbff
Author: techno-sam <77073745+techno-sam@users.noreply.github.com> Date: Thu Apr 6 17:10:26 2023 -0700 Merge branch 'Creators-of-Create:mc1.18/dev' into mc1.18/dev commit53240bd42f
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Mon Apr 3 21:42:29 2023 +0100 Corrected Bogey InteractionResult To Pass commit69326e361a
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Mon Apr 3 21:30:28 2023 +0100 Fixed Default Values When Used Styles Are Removed commit4f176979de
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Mon Apr 3 19:33:17 2023 +0100 Fixed Carriage Sounds (Again) commit1e80af3303
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Mon Apr 3 19:27:58 2023 +0100 Refactored Bogey Sizes To Seperate Class commit129be61fee
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Mon Apr 3 17:20:17 2023 +0100 Fixed Bogey Sound Loading commit2543185a55
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Mon Apr 3 09:45:23 2023 +0100 Added Bogey Sound Customisation commit1ad5ae9514
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Mon Apr 3 00:44:53 2023 +0100 Added Size Transforms If Size Is Not Available For New Style commit96566b1614
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 2 23:02:02 2023 +0100 Moved Bogey Style Inside Of Bogey Data And Implemented Bogey Data Communication commiteedd984738
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 2 16:53:55 2023 +0100 Fixed Large Bogey Size commit68ca0974c6
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 2 16:47:58 2023 +0100 Implemented Style Cycling & Default Values commita55ba4267a
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 2 16:46:15 2023 +0100 Implemented renderer instance creator commit43523302c2
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 2 16:45:33 2023 +0100 Removed Unused Standard Bogey Instance commit773e084422
Merge:0c0b5a1ed
d1e1f7ec5
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sat Apr 1 18:50:15 2023 +0100 Merge remote-tracking branch 'origin/mc1.18/dev' into mc1.18/dev # Conflicts: # src/main/java/com/simibubi/create/AllBogeyStyles.java # src/main/java/com/simibubi/create/content/logistics/trains/BogeyTileEntityRenderer.java # src/main/java/com/simibubi/create/content/logistics/trains/entity/BogeyStyle.java # src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntityRenderer.java # src/main/java/com/simibubi/create/content/logistics/trains/entity/StandardBogeyInstance.java # src/main/java/com/simibubi/create/foundation/data/BogeyStyleBuilder.java commit0c0b5a1ed6
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sat Apr 1 18:39:58 2023 +0100 Linked Style Registry To Bogey Blocks commit71f839ee51
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sat Apr 1 18:39:03 2023 +0100 Replaced size boolean with direct use of size enum commit50ff081704
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 30 18:47:13 2023 +0100 Added Resource Location To NBT helper methods commitd1e1f7ec5a
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 30 18:47:13 2023 +0100 Re-worked BogeyStyles commitda593fccb1
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 30 18:46:02 2023 +0100 Refactored IBogeyBlock to AbstractBogeyBlock and extracted relevant StandardBogeyBlock implementations commit17432c9113
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sat Mar 25 10:20:50 2023 +0000 Fixed Incorrect Registry Loading commitc7d899369a
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Fri Mar 24 23:44:03 2023 +0000 Registered Registers commit6d862290d7
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Fri Mar 24 23:43:23 2023 +0000 Added BogeyStyleBuilder To Registrate commit3dfb9e3b3b
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Fri Mar 24 23:43:08 2023 +0000 Implemented AllBogeyStyles commitc9e71b462d
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Fri Mar 24 23:42:56 2023 +0000 Created BogeyStyleBuilder commita90977d642
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Fri Mar 24 23:42:25 2023 +0000 Created AllRegistries and BogeyStyle Registry commit154d455f3f
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Fri Mar 24 23:41:56 2023 +0000 Added BogeyStyle Wrapper commitdfb7640bfc
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 23 18:50:41 2023 +0000 Removed left over logging statement commit9920536cc3
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 23 18:50:18 2023 +0000 Implemented Secondary Shaft To Large Renderer commit6cd40cc6f9
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 23 18:49:56 2023 +0000 Prevented Overwrite When Using Two BlockStates Of The Same Type With Different Properties commit06fb901144
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 23 18:39:11 2023 +0000 Implemented Common Rendering For StandardBogeyRenderer commit435b0f8266
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 23 18:38:40 2023 +0000 Added Common Renderer commit96a0623dab
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 23 18:38:29 2023 +0000 Implemented BlockState Models For Rendering commit469d9d592b
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 23 17:42:28 2023 +0000 Added Standard Bogey Instance (Might be redundant) commit2661d260d8
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 23 17:42:06 2023 +0000 Refactored Changes To Existing Methods commit9ded16fbab
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 23 17:41:15 2023 +0000 Integrated BogeyRenderer To BogeyInstance (Also Corrected Rendering In Contraption) commit4a82fcbca1
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 23 17:40:13 2023 +0000 Implemented Changes To StandardBogeyBlock commit7238fb93f3
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 23 17:39:51 2023 +0000 Added Renderer To IBogeyBlock commitded4c1f613
Merge:91727cc84
3c02fe6ec
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Wed Mar 22 17:03:37 2023 +0000 Merge remote-tracking branch 'origin/mc1.18/dev' into mc1.18/dev commit91727cc84a
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Wed Mar 22 17:03:28 2023 +0000 Implemented Model Data Initializer to StandardBogeyRenderer commit6d98a1f469
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Wed Mar 22 17:03:00 2023 +0000 Added Contraption Model Instance Initializer commit3c02fe6ecc
Author: Rabbitminers <79579164+Rabbitminers@users.noreply.github.com> Date: Tue Mar 21 22:45:34 2023 +0000 Added missing render type check commit6672c49649
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Tue Mar 21 22:37:36 2023 +0000 Re-created standard bogey with test api commita8a9491fa0
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Tue Mar 21 22:34:54 2023 +0000 Implemented Proof Of Concept Generic Bogey Renderer commite4e5ac1c40
Author: SpottyTheTurtle <69260662+SpottyTheTurtle@users.noreply.github.com> Date: Sat Mar 11 21:34:59 2023 +0000 init
392 lines
14 KiB
Java
392 lines
14 KiB
Java
package com.simibubi.create.content.logistics.trains.entity;
|
|
|
|
import java.lang.ref.WeakReference;
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
import java.util.Objects;
|
|
import java.util.UUID;
|
|
import java.util.function.Consumer;
|
|
|
|
import javax.annotation.Nullable;
|
|
|
|
import org.apache.commons.lang3.mutable.MutableBoolean;
|
|
import org.apache.commons.lang3.mutable.MutableInt;
|
|
|
|
import com.simibubi.create.AllItems;
|
|
import com.simibubi.create.Create;
|
|
import com.simibubi.create.CreateClient;
|
|
import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
|
|
import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionHandlerClient;
|
|
import com.simibubi.create.content.logistics.trains.GraphLocation;
|
|
import com.simibubi.create.content.logistics.trains.ITrackBlock;
|
|
import com.simibubi.create.content.logistics.trains.TrackEdge;
|
|
import com.simibubi.create.content.logistics.trains.TrackGraph;
|
|
import com.simibubi.create.content.logistics.trains.TrackGraphHelper;
|
|
import com.simibubi.create.content.logistics.trains.TrackNode;
|
|
import com.simibubi.create.content.logistics.trains.entity.TravellingPoint.IEdgePointListener;
|
|
import com.simibubi.create.content.logistics.trains.entity.TravellingPoint.ITrackSelector;
|
|
import com.simibubi.create.content.logistics.trains.entity.TravellingPoint.ITurnListener;
|
|
import com.simibubi.create.content.logistics.trains.entity.TravellingPoint.SteerDirection;
|
|
import com.simibubi.create.content.logistics.trains.track.BezierTrackPointLocation;
|
|
import com.simibubi.create.content.logistics.trains.track.TrackBlockOutline;
|
|
import com.simibubi.create.content.logistics.trains.track.TrackBlockOutline.BezierPointSelection;
|
|
import com.simibubi.create.foundation.item.TooltipHelper;
|
|
import com.simibubi.create.foundation.networking.AllPackets;
|
|
import com.simibubi.create.foundation.utility.Couple;
|
|
import com.simibubi.create.foundation.utility.Lang;
|
|
import com.simibubi.create.foundation.utility.Pair;
|
|
|
|
import net.minecraft.ChatFormatting;
|
|
import net.minecraft.client.Minecraft;
|
|
import net.minecraft.client.player.LocalPlayer;
|
|
import net.minecraft.core.BlockPos;
|
|
import net.minecraft.core.Direction.AxisDirection;
|
|
import net.minecraft.network.chat.Component;
|
|
import net.minecraft.world.entity.Entity;
|
|
import net.minecraft.world.level.Level;
|
|
import net.minecraft.world.level.LevelAccessor;
|
|
import net.minecraft.world.level.block.state.BlockState;
|
|
import net.minecraft.world.phys.AABB;
|
|
import net.minecraft.world.phys.BlockHitResult;
|
|
import net.minecraft.world.phys.HitResult;
|
|
import net.minecraft.world.phys.Vec3;
|
|
import net.minecraftforge.api.distmarker.Dist;
|
|
import net.minecraftforge.api.distmarker.OnlyIn;
|
|
import net.minecraftforge.client.event.InputEvent.ClickInputEvent;
|
|
|
|
public class TrainRelocator {
|
|
|
|
static WeakReference<CarriageContraptionEntity> hoveredEntity = new WeakReference<>(null);
|
|
static UUID relocatingTrain;
|
|
static Vec3 relocatingOrigin;
|
|
static int relocatingEntityId;
|
|
|
|
static BlockPos lastHoveredPos;
|
|
static BezierTrackPointLocation lastHoveredBezierSegment;
|
|
static Boolean lastHoveredResult;
|
|
static List<Vec3> toVisualise;
|
|
|
|
public static boolean isRelocating() {
|
|
return relocatingTrain != null;
|
|
}
|
|
|
|
@OnlyIn(Dist.CLIENT)
|
|
public static void onClicked(ClickInputEvent event) {
|
|
if (relocatingTrain == null)
|
|
return;
|
|
|
|
Minecraft mc = Minecraft.getInstance();
|
|
LocalPlayer player = mc.player;
|
|
if (player == null)
|
|
return;
|
|
if (player.isSpectator())
|
|
return;
|
|
|
|
if (!player.position()
|
|
.closerThan(relocatingOrigin, 24) || player.isSteppingCarefully()) {
|
|
relocatingTrain = null;
|
|
player.displayClientMessage(Lang.translateDirect("train.relocate.abort")
|
|
.withStyle(ChatFormatting.RED), true);
|
|
return;
|
|
}
|
|
|
|
if (player.isPassenger())
|
|
return;
|
|
if (mc.level == null)
|
|
return;
|
|
Train relocating = getRelocating(mc.level);
|
|
if (relocating != null) {
|
|
Boolean relocate = relocateClient(relocating, false);
|
|
if (relocate != null && relocate.booleanValue())
|
|
relocatingTrain = null;
|
|
if (relocate != null)
|
|
event.setCanceled(true);
|
|
}
|
|
}
|
|
|
|
@Nullable
|
|
@OnlyIn(Dist.CLIENT)
|
|
public static Boolean relocateClient(Train relocating, boolean simulate) {
|
|
Minecraft mc = Minecraft.getInstance();
|
|
HitResult hitResult = mc.hitResult;
|
|
if (!(hitResult instanceof BlockHitResult blockhit))
|
|
return null;
|
|
|
|
BlockPos blockPos = blockhit.getBlockPos();
|
|
BezierTrackPointLocation hoveredBezier = null;
|
|
|
|
boolean upsideDown = relocating.carriages.get(0).leadingBogey().isUpsideDown();
|
|
Vec3 offset = upsideDown ? new Vec3(0, -0.5, 0) : Vec3.ZERO;
|
|
|
|
if (simulate && toVisualise != null && lastHoveredResult != null) {
|
|
for (int i = 0; i < toVisualise.size() - 1; i++) {
|
|
Vec3 vec1 = toVisualise.get(i).add(offset);
|
|
Vec3 vec2 = toVisualise.get(i + 1).add(offset);
|
|
CreateClient.OUTLINER.showLine(Pair.of(relocating, i), vec1.add(0, -.925f, 0), vec2.add(0, -.925f, 0))
|
|
.colored(lastHoveredResult || i != toVisualise.size() - 2 ? 0x95CD41 : 0xEA5C2B)
|
|
.disableLineNormals()
|
|
.lineWidth(i % 2 == 1 ? 1 / 6f : 1 / 4f);
|
|
}
|
|
}
|
|
|
|
BezierPointSelection bezierSelection = TrackBlockOutline.result;
|
|
if (bezierSelection != null) {
|
|
blockPos = bezierSelection.te()
|
|
.getBlockPos();
|
|
hoveredBezier = bezierSelection.loc();
|
|
}
|
|
|
|
if (simulate) {
|
|
if (lastHoveredPos != null && lastHoveredPos.equals(blockPos)
|
|
&& Objects.equals(lastHoveredBezierSegment, hoveredBezier))
|
|
return lastHoveredResult;
|
|
lastHoveredPos = blockPos;
|
|
lastHoveredBezierSegment = hoveredBezier;
|
|
toVisualise = null;
|
|
}
|
|
|
|
BlockState blockState = mc.level.getBlockState(blockPos);
|
|
if (!(blockState.getBlock()instanceof ITrackBlock track))
|
|
return lastHoveredResult = null;
|
|
|
|
Vec3 lookAngle = mc.player.getLookAngle();
|
|
boolean direction = bezierSelection != null && lookAngle.dot(bezierSelection.direction()) < 0;
|
|
boolean result = relocate(relocating, mc.level, blockPos, hoveredBezier, direction, lookAngle, true);
|
|
if (!simulate && result) {
|
|
relocating.carriages.forEach(c -> c.forEachPresentEntity(e -> e.nonDamageTicks = 10));
|
|
AllPackets.channel.sendToServer(new TrainRelocationPacket(relocatingTrain, blockPos, hoveredBezier,
|
|
direction, lookAngle, relocatingEntityId));
|
|
}
|
|
|
|
return lastHoveredResult = result;
|
|
}
|
|
|
|
public static boolean relocate(Train train, Level level, BlockPos pos, BezierTrackPointLocation bezier,
|
|
boolean bezierDirection, Vec3 lookAngle, boolean simulate) {
|
|
BlockState blockState = level.getBlockState(pos);
|
|
if (!(blockState.getBlock()instanceof ITrackBlock track))
|
|
return false;
|
|
|
|
Pair<Vec3, AxisDirection> nearestTrackAxis = track.getNearestTrackAxis(level, pos, blockState, lookAngle);
|
|
GraphLocation graphLocation = bezier != null
|
|
? TrackGraphHelper.getBezierGraphLocationAt(level, pos,
|
|
bezierDirection ? AxisDirection.POSITIVE : AxisDirection.NEGATIVE, bezier)
|
|
: TrackGraphHelper.getGraphLocationAt(level, pos, nearestTrackAxis.getSecond(),
|
|
nearestTrackAxis.getFirst());
|
|
|
|
if (graphLocation == null)
|
|
return false;
|
|
|
|
TrackGraph graph = graphLocation.graph;
|
|
TrackNode node1 = graph.locateNode(graphLocation.edge.getFirst());
|
|
TrackNode node2 = graph.locateNode(graphLocation.edge.getSecond());
|
|
TrackEdge edge = graph.getConnectionsFrom(node1)
|
|
.get(node2);
|
|
if (edge == null)
|
|
return false;
|
|
|
|
TravellingPoint probe = new TravellingPoint(node1, node2, edge, graphLocation.position, false);
|
|
IEdgePointListener ignoreSignals = probe.ignoreEdgePoints();
|
|
ITurnListener ignoreTurns = probe.ignoreTurns();
|
|
List<Pair<Couple<TrackNode>, Double>> recordedLocations = new ArrayList<>();
|
|
List<Vec3> recordedVecs = new ArrayList<>();
|
|
Consumer<TravellingPoint> recorder = tp -> {
|
|
recordedLocations.add(Pair.of(Couple.create(tp.node1, tp.node2), tp.position));
|
|
recordedVecs.add(tp.getPosition());
|
|
};
|
|
ITrackSelector steer = probe.steer(SteerDirection.NONE, track.getUpNormal(level, pos, blockState));
|
|
MutableBoolean blocked = new MutableBoolean(false);
|
|
MutableBoolean portal = new MutableBoolean(false);
|
|
|
|
MutableInt blockingIndex = new MutableInt(0);
|
|
train.forEachTravellingPointBackwards((tp, d) -> {
|
|
if (blocked.booleanValue())
|
|
return;
|
|
probe.travel(graph, d, steer, ignoreSignals, ignoreTurns, $ -> {
|
|
portal.setTrue();
|
|
return true;
|
|
});
|
|
recorder.accept(probe);
|
|
if (probe.blocked || portal.booleanValue()) {
|
|
blocked.setTrue();
|
|
return;
|
|
}
|
|
blockingIndex.increment();
|
|
});
|
|
|
|
if (level.isClientSide && simulate && !recordedVecs.isEmpty()) {
|
|
toVisualise = new ArrayList<>();
|
|
toVisualise.add(recordedVecs.get(0));
|
|
}
|
|
|
|
for (int i = 0; i < recordedVecs.size() - 1; i++) {
|
|
Vec3 vec1 = recordedVecs.get(i);
|
|
Vec3 vec2 = recordedVecs.get(i + 1);
|
|
boolean blocking = i >= blockingIndex.intValue() - 1;
|
|
boolean collided = !blocked.booleanValue()
|
|
&& Train.findCollidingTrain(level, vec1, vec2, train, level.dimension()) != null;
|
|
if (level.isClientSide && simulate)
|
|
toVisualise.add(vec2);
|
|
if (collided || blocking)
|
|
return false;
|
|
}
|
|
|
|
if (blocked.booleanValue())
|
|
return false;
|
|
|
|
if (simulate)
|
|
return true;
|
|
|
|
train.leaveStation();
|
|
train.derailed = false;
|
|
train.navigation.waitingForSignal = null;
|
|
train.occupiedSignalBlocks.clear();
|
|
train.graph = graph;
|
|
train.speed = 0;
|
|
train.migratingPoints.clear();
|
|
train.cancelStall();
|
|
|
|
if (train.navigation.destination != null)
|
|
train.navigation.cancelNavigation();
|
|
|
|
train.forEachTravellingPoint(tp -> {
|
|
Pair<Couple<TrackNode>, Double> last = recordedLocations.remove(recordedLocations.size() - 1);
|
|
tp.node1 = last.getFirst()
|
|
.getFirst();
|
|
tp.node2 = last.getFirst()
|
|
.getSecond();
|
|
tp.position = last.getSecond();
|
|
tp.edge = graph.getConnectionsFrom(tp.node1)
|
|
.get(tp.node2);
|
|
});
|
|
|
|
for (Carriage carriage : train.carriages)
|
|
carriage.updateContraptionAnchors();
|
|
|
|
train.status.successfulMigration();
|
|
train.collectInitiallyOccupiedSignalBlocks();
|
|
return true;
|
|
}
|
|
|
|
@OnlyIn(Dist.CLIENT)
|
|
public static void visualise(Train train, int i, Vec3 v1, Vec3 v2, boolean valid) {
|
|
CreateClient.OUTLINER.showLine(Pair.of(train, i), v1.add(0, -.825f, 0), v2.add(0, -.825f, 0))
|
|
.colored(valid ? 0x95CD41 : 0xEA5C2B)
|
|
.disableLineNormals()
|
|
.lineWidth(i % 2 == 1 ? 1 / 6f : 1 / 4f);
|
|
}
|
|
|
|
@OnlyIn(Dist.CLIENT)
|
|
public static void clientTick() {
|
|
Minecraft mc = Minecraft.getInstance();
|
|
LocalPlayer player = mc.player;
|
|
|
|
if (player == null)
|
|
return;
|
|
if (player.isPassenger())
|
|
return;
|
|
if (mc.level == null)
|
|
return;
|
|
|
|
if (relocatingTrain != null) {
|
|
Train relocating = getRelocating(mc.level);
|
|
if (relocating == null) {
|
|
relocatingTrain = null;
|
|
return;
|
|
}
|
|
|
|
Entity entity = mc.level.getEntity(relocatingEntityId);
|
|
if (entity instanceof AbstractContraptionEntity ce && Math.abs(ce.getPosition(0)
|
|
.subtract(ce.getPosition(1))
|
|
.lengthSqr()) > 1 / 1024d) {
|
|
player.displayClientMessage(Lang.translateDirect("train.cannot_relocate_moving")
|
|
.withStyle(ChatFormatting.RED), true);
|
|
relocatingTrain = null;
|
|
return;
|
|
}
|
|
|
|
if (!AllItems.WRENCH.isIn(player.getMainHandItem())) {
|
|
player.displayClientMessage(Lang.translateDirect("train.relocate.abort")
|
|
.withStyle(ChatFormatting.RED), true);
|
|
relocatingTrain = null;
|
|
return;
|
|
}
|
|
|
|
if (!player.position()
|
|
.closerThan(relocatingOrigin, 24)) {
|
|
player.displayClientMessage(Lang.translateDirect("train.relocate.too_far")
|
|
.withStyle(ChatFormatting.RED), true);
|
|
return;
|
|
}
|
|
|
|
Boolean success = relocateClient(relocating, true);
|
|
if (success == null)
|
|
player.displayClientMessage(Lang.translateDirect("train.relocate", relocating.name), true);
|
|
else if (success.booleanValue())
|
|
player.displayClientMessage(Lang.translateDirect("train.relocate.valid")
|
|
.withStyle(ChatFormatting.GREEN), true);
|
|
else
|
|
player.displayClientMessage(Lang.translateDirect("train.relocate.invalid")
|
|
.withStyle(ChatFormatting.RED), true);
|
|
return;
|
|
}
|
|
|
|
Couple<Vec3> rayInputs = ContraptionHandlerClient.getRayInputs(player);
|
|
Vec3 origin = rayInputs.getFirst();
|
|
Vec3 target = rayInputs.getSecond();
|
|
|
|
CarriageContraptionEntity currentEntity = hoveredEntity.get();
|
|
if (currentEntity != null) {
|
|
if (ContraptionHandlerClient.rayTraceContraption(origin, target, currentEntity) != null)
|
|
return;
|
|
hoveredEntity = new WeakReference<>(null);
|
|
}
|
|
|
|
AABB aabb = new AABB(origin, target);
|
|
List<CarriageContraptionEntity> intersectingContraptions =
|
|
mc.level.getEntitiesOfClass(CarriageContraptionEntity.class, aabb);
|
|
|
|
for (CarriageContraptionEntity contraptionEntity : intersectingContraptions) {
|
|
if (ContraptionHandlerClient.rayTraceContraption(origin, target, contraptionEntity) == null)
|
|
continue;
|
|
hoveredEntity = new WeakReference<>(contraptionEntity);
|
|
}
|
|
}
|
|
|
|
@OnlyIn(Dist.CLIENT)
|
|
public static boolean carriageWrenched(Vec3 vec3, CarriageContraptionEntity entity) {
|
|
Train train = getTrainFromEntity(entity);
|
|
if (train == null)
|
|
return false;
|
|
relocatingOrigin = vec3;
|
|
relocatingTrain = train.id;
|
|
relocatingEntityId = entity.getId();
|
|
return true;
|
|
}
|
|
|
|
@OnlyIn(Dist.CLIENT)
|
|
public static boolean addToTooltip(List<Component> tooltip, boolean shiftKeyDown) {
|
|
Train train = getTrainFromEntity(hoveredEntity.get());
|
|
if (train != null && train.derailed) {
|
|
TooltipHelper.addHint(tooltip, "hint.derailed_train");
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
@OnlyIn(Dist.CLIENT)
|
|
private static Train getRelocating(LevelAccessor level) {
|
|
return relocatingTrain == null ? null : Create.RAILWAYS.sided(level).trains.get(relocatingTrain);
|
|
}
|
|
|
|
private static Train getTrainFromEntity(CarriageContraptionEntity carriageContraptionEntity) {
|
|
if (carriageContraptionEntity == null)
|
|
return null;
|
|
Carriage carriage = carriageContraptionEntity.getCarriage();
|
|
if (carriage == null)
|
|
return null;
|
|
return carriage.train;
|
|
}
|
|
|
|
}
|