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
401 lines
13 KiB
Java
401 lines
13 KiB
Java
package com.simibubi.create.content.logistics.trains.track;
|
|
|
|
import java.util.HashMap;
|
|
import java.util.HashSet;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map.Entry;
|
|
import java.util.Set;
|
|
|
|
import com.jozufozu.flywheel.backend.instancing.InstancedRenderDispatcher;
|
|
import com.simibubi.create.AllBlocks;
|
|
import com.simibubi.create.AllTags;
|
|
import com.simibubi.create.content.contraptions.components.structureMovement.ITransformableTE;
|
|
import com.simibubi.create.content.contraptions.components.structureMovement.StructureTransform;
|
|
import com.simibubi.create.content.logistics.trains.BezierConnection;
|
|
import com.simibubi.create.content.logistics.trains.ITrackBlock;
|
|
import com.simibubi.create.content.logistics.trains.TrackNodeLocation;
|
|
import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
|
|
import com.simibubi.create.foundation.networking.AllPackets;
|
|
import com.simibubi.create.foundation.tileEntity.IMergeableTE;
|
|
import com.simibubi.create.foundation.tileEntity.RemoveTileEntityPacket;
|
|
import com.simibubi.create.foundation.tileEntity.SmartTileEntity;
|
|
import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour;
|
|
import com.simibubi.create.foundation.utility.Pair;
|
|
import com.simibubi.create.foundation.utility.VecHelper;
|
|
|
|
import net.minecraft.core.BlockPos;
|
|
import net.minecraft.core.Direction.Axis;
|
|
import net.minecraft.core.Registry;
|
|
import net.minecraft.nbt.CompoundTag;
|
|
import net.minecraft.nbt.ListTag;
|
|
import net.minecraft.nbt.NbtUtils;
|
|
import net.minecraft.nbt.Tag;
|
|
import net.minecraft.resources.ResourceKey;
|
|
import net.minecraft.resources.ResourceLocation;
|
|
import net.minecraft.server.level.ServerLevel;
|
|
import net.minecraft.util.Mth;
|
|
import net.minecraft.world.level.Level;
|
|
import net.minecraft.world.level.block.entity.BlockEntity;
|
|
import net.minecraft.world.level.block.entity.BlockEntityType;
|
|
import net.minecraft.world.level.block.state.BlockState;
|
|
import net.minecraft.world.level.material.FluidState;
|
|
import net.minecraft.world.level.material.Fluids;
|
|
import net.minecraft.world.phys.AABB;
|
|
import net.minecraft.world.phys.Vec3;
|
|
import net.minecraftforge.api.distmarker.Dist;
|
|
import net.minecraftforge.api.distmarker.OnlyIn;
|
|
import net.minecraftforge.fml.DistExecutor;
|
|
|
|
public class TrackTileEntity extends SmartTileEntity implements ITransformableTE, IMergeableTE {
|
|
|
|
Map<BlockPos, BezierConnection> connections;
|
|
boolean cancelDrops;
|
|
|
|
public Pair<ResourceKey<Level>, BlockPos> boundLocation;
|
|
|
|
public TrackTileEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
|
|
super(type, pos, state);
|
|
connections = new HashMap<>();
|
|
setLazyTickRate(100);
|
|
}
|
|
|
|
public Map<BlockPos, BezierConnection> getConnections() {
|
|
return connections;
|
|
}
|
|
|
|
@Override
|
|
public void initialize() {
|
|
super.initialize();
|
|
if (!level.isClientSide && hasInteractableConnections())
|
|
registerToCurveInteraction();
|
|
}
|
|
|
|
@Override
|
|
public void lazyTick() {
|
|
for (BezierConnection connection : connections.values())
|
|
if (connection.isPrimary())
|
|
manageFakeTracksAlong(connection, false);
|
|
}
|
|
|
|
public void validateConnections() {
|
|
Set<BlockPos> invalid = new HashSet<>();
|
|
|
|
for (Entry<BlockPos, BezierConnection> entry : connections.entrySet()) {
|
|
BlockPos key = entry.getKey();
|
|
BezierConnection bc = entry.getValue();
|
|
|
|
if (!key.equals(bc.getKey()) || !worldPosition.equals(bc.tePositions.getFirst())) {
|
|
invalid.add(key);
|
|
continue;
|
|
}
|
|
|
|
BlockState blockState = level.getBlockState(key);
|
|
if (blockState.getBlock()instanceof ITrackBlock trackBlock && !blockState.getValue(TrackBlock.HAS_TE))
|
|
for (Vec3 v : trackBlock.getTrackAxes(level, key, blockState)) {
|
|
Vec3 bcEndAxis = bc.axes.getSecond();
|
|
if (v.distanceTo(bcEndAxis) < 1 / 1024f || v.distanceTo(bcEndAxis.scale(-1)) < 1 / 1024f)
|
|
level.setBlock(key, blockState.setValue(TrackBlock.HAS_TE, true), 3);
|
|
}
|
|
|
|
BlockEntity blockEntity = level.getBlockEntity(key);
|
|
if (!(blockEntity instanceof TrackTileEntity trackTE) || blockEntity.isRemoved()) {
|
|
invalid.add(key);
|
|
continue;
|
|
}
|
|
|
|
if (!trackTE.connections.containsKey(worldPosition))
|
|
trackTE.addConnection(bc.secondary());
|
|
}
|
|
|
|
for (BlockPos blockPos : invalid)
|
|
removeConnection(blockPos);
|
|
}
|
|
|
|
public void addConnection(BezierConnection connection) {
|
|
// don't replace existing connections with different materials
|
|
if (connections.containsKey(connection.getKey()) && connection.equalsSansMaterial(connections.get(connection.getKey())))
|
|
return;
|
|
connections.put(connection.getKey(), connection);
|
|
level.scheduleTick(worldPosition, getBlockState().getBlock(), 1);
|
|
notifyUpdate();
|
|
|
|
if (connection.isPrimary())
|
|
manageFakeTracksAlong(connection, false);
|
|
}
|
|
|
|
public void removeConnection(BlockPos target) {
|
|
BezierConnection removed = connections.remove(target);
|
|
notifyUpdate();
|
|
|
|
if (removed != null)
|
|
manageFakeTracksAlong(removed, true);
|
|
|
|
if (!connections.isEmpty() || getBlockState().getOptionalValue(TrackBlock.SHAPE)
|
|
.orElse(TrackShape.NONE)
|
|
.isPortal())
|
|
return;
|
|
|
|
BlockState blockState = level.getBlockState(worldPosition);
|
|
if (blockState.hasProperty(TrackBlock.HAS_TE))
|
|
level.setBlockAndUpdate(worldPosition, blockState.setValue(TrackBlock.HAS_TE, false));
|
|
AllPackets.channel.send(packetTarget(), new RemoveTileEntityPacket(worldPosition));
|
|
}
|
|
|
|
public void removeInboundConnections() {
|
|
for (BezierConnection bezierConnection : connections.values()) {
|
|
BlockEntity blockEntity = level.getBlockEntity(bezierConnection.getKey());
|
|
if (!(blockEntity instanceof TrackTileEntity))
|
|
return;
|
|
TrackTileEntity other = (TrackTileEntity) blockEntity;
|
|
other.removeConnection(bezierConnection.tePositions.getFirst());
|
|
|
|
if (!cancelDrops)
|
|
bezierConnection.spawnItems(level);
|
|
bezierConnection.spawnDestroyParticles(level);
|
|
}
|
|
AllPackets.channel.send(packetTarget(), new RemoveTileEntityPacket(worldPosition));
|
|
}
|
|
|
|
public void bind(ResourceKey<Level> boundDimension, BlockPos boundLocation) {
|
|
this.boundLocation = Pair.of(boundDimension, boundLocation);
|
|
setChanged();
|
|
}
|
|
|
|
@Override
|
|
public void writeSafe(CompoundTag tag) {
|
|
super.writeSafe(tag);
|
|
writeTurns(tag);
|
|
}
|
|
|
|
@Override
|
|
protected void write(CompoundTag tag, boolean clientPacket) {
|
|
super.write(tag, clientPacket);
|
|
writeTurns(tag);
|
|
if (boundLocation == null)
|
|
return;
|
|
tag.put("BoundLocation", NbtUtils.writeBlockPos(boundLocation.getSecond()));
|
|
tag.putString("BoundDimension", boundLocation.getFirst()
|
|
.location()
|
|
.toString());
|
|
}
|
|
|
|
private void writeTurns(CompoundTag tag) {
|
|
ListTag listTag = new ListTag();
|
|
for (BezierConnection bezierConnection : connections.values())
|
|
listTag.add(bezierConnection.write(worldPosition));
|
|
tag.put("Connections", listTag);
|
|
}
|
|
|
|
@Override
|
|
protected void read(CompoundTag tag, boolean clientPacket) {
|
|
super.read(tag, clientPacket);
|
|
connections.clear();
|
|
for (Tag t : tag.getList("Connections", Tag.TAG_COMPOUND)) {
|
|
if (!(t instanceof CompoundTag))
|
|
return;
|
|
BezierConnection connection = new BezierConnection((CompoundTag) t, worldPosition);
|
|
connections.put(connection.getKey(), connection);
|
|
}
|
|
|
|
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> InstancedRenderDispatcher.enqueueUpdate(this));
|
|
|
|
if (hasInteractableConnections())
|
|
registerToCurveInteraction();
|
|
else
|
|
removeFromCurveInteraction();
|
|
|
|
if (tag.contains("BoundLocation"))
|
|
boundLocation = Pair.of(
|
|
ResourceKey.create(Registry.DIMENSION_REGISTRY, new ResourceLocation(tag.getString("BoundDimension"))),
|
|
NbtUtils.readBlockPos(tag.getCompound("BoundLocation")));
|
|
}
|
|
|
|
@Override
|
|
@OnlyIn(Dist.CLIENT)
|
|
public AABB getRenderBoundingBox() {
|
|
return INFINITE_EXTENT_AABB;
|
|
}
|
|
|
|
@Override
|
|
public void addBehaviours(List<TileEntityBehaviour> behaviours) {}
|
|
|
|
@Override
|
|
public void accept(BlockEntity other) {
|
|
if (other instanceof TrackTileEntity track)
|
|
connections.putAll(track.connections);
|
|
validateConnections();
|
|
level.scheduleTick(worldPosition, getBlockState().getBlock(), 1);
|
|
}
|
|
|
|
public boolean hasInteractableConnections() {
|
|
for (BezierConnection connection : connections.values())
|
|
if (connection.isPrimary())
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
@Override
|
|
public void transform(StructureTransform transform) {
|
|
if (transform.rotationAxis != Axis.Y)
|
|
return;
|
|
|
|
Map<BlockPos, BezierConnection> transformedConnections = new HashMap<>();
|
|
for (Entry<BlockPos, BezierConnection> entry : connections.entrySet()) {
|
|
BezierConnection newConnection = entry.getValue();
|
|
newConnection.normals.replace(transform::applyWithoutOffsetUncentered);
|
|
newConnection.axes.replace(transform::applyWithoutOffsetUncentered);
|
|
|
|
BlockPos diff = newConnection.tePositions.getSecond()
|
|
.subtract(newConnection.tePositions.getFirst());
|
|
newConnection.tePositions.setSecond(new BlockPos(Vec3.atCenterOf(newConnection.tePositions.getFirst())
|
|
.add(transform.applyWithoutOffsetUncentered(Vec3.atLowerCornerOf(diff)))));
|
|
|
|
Vec3 teVec = Vec3.atLowerCornerOf(worldPosition);
|
|
Vec3 teCenterVec = teVec.add(0.5, 0.5, 0.5);
|
|
Vec3 start = newConnection.starts.getFirst();
|
|
Vec3 startToTE = start.subtract(teCenterVec);
|
|
Vec3 endToStart = newConnection.starts.getSecond()
|
|
.subtract(start);
|
|
startToTE = transform.applyWithoutOffsetUncentered(startToTE)
|
|
.add(teCenterVec);
|
|
endToStart = transform.applyWithoutOffsetUncentered(endToStart)
|
|
.add(startToTE);
|
|
|
|
newConnection.starts.setFirst(new TrackNodeLocation(startToTE).getLocation());
|
|
newConnection.starts.setSecond(new TrackNodeLocation(endToStart).getLocation());
|
|
|
|
BlockPos newTarget = newConnection.getKey();
|
|
transformedConnections.put(newTarget, newConnection);
|
|
}
|
|
|
|
connections = transformedConnections;
|
|
}
|
|
|
|
@Override
|
|
public void invalidate() {
|
|
super.invalidate();
|
|
if (level.isClientSide)
|
|
removeFromCurveInteraction();
|
|
}
|
|
|
|
@Override
|
|
public void remove() {
|
|
super.remove();
|
|
|
|
for (BezierConnection connection : connections.values())
|
|
manageFakeTracksAlong(connection, true);
|
|
|
|
if (boundLocation != null && level instanceof ServerLevel) {
|
|
ServerLevel otherLevel = level.getServer()
|
|
.getLevel(boundLocation.getFirst());
|
|
if (otherLevel == null)
|
|
return;
|
|
if (AllTags.AllBlockTags.TRACKS.matches(otherLevel.getBlockState(boundLocation.getSecond())))
|
|
otherLevel.destroyBlock(boundLocation.getSecond(), false);
|
|
}
|
|
}
|
|
|
|
private void registerToCurveInteraction() {
|
|
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> this::registerToCurveInteractionUnsafe);
|
|
}
|
|
|
|
private void removeFromCurveInteraction() {
|
|
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> this::removeFromCurveInteractionUnsafe);
|
|
}
|
|
|
|
@OnlyIn(Dist.CLIENT)
|
|
private void registerToCurveInteractionUnsafe() {
|
|
TrackBlockOutline.TRACKS_WITH_TURNS.get(level)
|
|
.put(worldPosition, this);
|
|
}
|
|
|
|
@OnlyIn(Dist.CLIENT)
|
|
private void removeFromCurveInteractionUnsafe() {
|
|
TrackBlockOutline.TRACKS_WITH_TURNS.get(level)
|
|
.remove(worldPosition);
|
|
}
|
|
|
|
public void manageFakeTracksAlong(BezierConnection bc, boolean remove) {
|
|
Map<Pair<Integer, Integer>, Double> yLevels = new HashMap<>();
|
|
BlockPos tePosition = bc.tePositions.getFirst();
|
|
Vec3 end1 = bc.starts.getFirst()
|
|
.subtract(Vec3.atLowerCornerOf(tePosition))
|
|
.add(0, 3 / 16f, 0);
|
|
Vec3 end2 = bc.starts.getSecond()
|
|
.subtract(Vec3.atLowerCornerOf(tePosition))
|
|
.add(0, 3 / 16f, 0);
|
|
Vec3 axis1 = bc.axes.getFirst();
|
|
Vec3 axis2 = bc.axes.getSecond();
|
|
|
|
double handleLength = bc.getHandleLength();
|
|
|
|
Vec3 finish1 = axis1.scale(handleLength)
|
|
.add(end1);
|
|
Vec3 finish2 = axis2.scale(handleLength)
|
|
.add(end2);
|
|
|
|
Vec3 faceNormal1 = bc.normals.getFirst();
|
|
Vec3 faceNormal2 = bc.normals.getSecond();
|
|
|
|
int segCount = bc.getSegmentCount();
|
|
float[] lut = bc.getStepLUT();
|
|
|
|
for (int i = 0; i < segCount; i++) {
|
|
float t = i == segCount ? 1 : i * lut[i] / segCount;
|
|
t += 0.5f / segCount;
|
|
|
|
Vec3 result = VecHelper.bezier(end1, end2, finish1, finish2, t);
|
|
Vec3 derivative = VecHelper.bezierDerivative(end1, end2, finish1, finish2, t)
|
|
.normalize();
|
|
Vec3 faceNormal =
|
|
faceNormal1.equals(faceNormal2) ? faceNormal1 : VecHelper.slerp(t, faceNormal1, faceNormal2);
|
|
Vec3 normal = faceNormal.cross(derivative)
|
|
.normalize();
|
|
Vec3 below = result.add(faceNormal.scale(-.25f));
|
|
Vec3 rail1 = below.add(normal.scale(.05f));
|
|
Vec3 rail2 = below.subtract(normal.scale(.05f));
|
|
Vec3 railMiddle = rail1.add(rail2)
|
|
.scale(.5);
|
|
|
|
for (Vec3 vec : new Vec3[] { railMiddle }) {
|
|
BlockPos pos = new BlockPos(vec);
|
|
Pair<Integer, Integer> key = Pair.of(pos.getX(), pos.getZ());
|
|
if (!yLevels.containsKey(key) || yLevels.get(key) > vec.y)
|
|
yLevels.put(key, vec.y);
|
|
}
|
|
}
|
|
|
|
for (Entry<Pair<Integer, Integer>, Double> entry : yLevels.entrySet()) {
|
|
double yValue = entry.getValue();
|
|
int floor = Mth.floor(yValue);
|
|
BlockPos targetPos = new BlockPos(entry.getKey()
|
|
.getFirst(), floor,
|
|
entry.getKey()
|
|
.getSecond());
|
|
targetPos = targetPos.offset(tePosition)
|
|
.above(1);
|
|
|
|
BlockState stateAtPos = level.getBlockState(targetPos);
|
|
boolean present = AllBlocks.FAKE_TRACK.has(stateAtPos);
|
|
|
|
if (remove) {
|
|
if (present)
|
|
level.removeBlock(targetPos, false);
|
|
continue;
|
|
}
|
|
|
|
FluidState fluidState = stateAtPos.getFluidState();
|
|
if (!fluidState.isEmpty() && !fluidState.isSourceOfType(Fluids.WATER))
|
|
continue;
|
|
|
|
if (!present && stateAtPos.getMaterial()
|
|
.isReplaceable())
|
|
level.setBlock(targetPos,
|
|
ProperWaterloggedBlock.withWater(level, AllBlocks.FAKE_TRACK.getDefaultState(), targetPos), 3);
|
|
FakeTrackBlock.keepAlive(level, targetPos);
|
|
}
|
|
}
|
|
|
|
}
|