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
643 lines
19 KiB
Java
643 lines
19 KiB
Java
package com.simibubi.create.content.logistics.trains;
|
|
|
|
import java.util.Iterator;
|
|
|
|
import com.jozufozu.flywheel.util.transform.TransformStack;
|
|
import com.mojang.blaze3d.vertex.PoseStack;
|
|
import com.mojang.blaze3d.vertex.PoseStack.Pose;
|
|
import com.simibubi.create.AllBlocks;
|
|
import com.simibubi.create.content.logistics.trains.track.TrackRenderer;
|
|
import com.simibubi.create.foundation.utility.Couple;
|
|
import com.simibubi.create.foundation.utility.Iterate;
|
|
import com.simibubi.create.foundation.utility.VecHelper;
|
|
|
|
import net.minecraft.core.BlockPos;
|
|
import net.minecraft.core.Direction.Axis;
|
|
import net.minecraft.core.particles.BlockParticleOption;
|
|
import net.minecraft.core.particles.ParticleTypes;
|
|
import net.minecraft.nbt.CompoundTag;
|
|
import net.minecraft.nbt.NbtUtils;
|
|
import net.minecraft.nbt.Tag;
|
|
import net.minecraft.network.FriendlyByteBuf;
|
|
import net.minecraft.server.level.ServerLevel;
|
|
import net.minecraft.util.Mth;
|
|
import net.minecraft.world.entity.item.ItemEntity;
|
|
import net.minecraft.world.entity.player.Inventory;
|
|
import net.minecraft.world.entity.player.Player;
|
|
import net.minecraft.world.item.ItemStack;
|
|
import net.minecraft.world.level.GameRules;
|
|
import net.minecraft.world.level.Level;
|
|
import net.minecraft.world.phys.AABB;
|
|
import net.minecraft.world.phys.Vec3;
|
|
import net.minecraftforge.api.distmarker.Dist;
|
|
import net.minecraftforge.api.distmarker.OnlyIn;
|
|
|
|
public class BezierConnection implements Iterable<BezierConnection.Segment> {
|
|
|
|
public Couple<BlockPos> tePositions;
|
|
public Couple<Vec3> starts;
|
|
public Couple<Vec3> axes;
|
|
public Couple<Vec3> normals;
|
|
public boolean primary;
|
|
public boolean hasGirder;
|
|
protected TrackMaterial trackMaterial;
|
|
|
|
// runtime
|
|
|
|
Vec3 finish1;
|
|
Vec3 finish2;
|
|
private boolean resolved;
|
|
private double length;
|
|
private float[] stepLUT;
|
|
private int segments;
|
|
|
|
private double radius;
|
|
private double handleLength;
|
|
|
|
private AABB bounds;
|
|
|
|
public BezierConnection(Couple<BlockPos> positions, Couple<Vec3> starts, Couple<Vec3> axes, Couple<Vec3> normals,
|
|
boolean primary, boolean girder, TrackMaterial material) {
|
|
tePositions = positions;
|
|
this.starts = starts;
|
|
this.axes = axes;
|
|
this.normals = normals;
|
|
this.primary = primary;
|
|
this.hasGirder = girder;
|
|
this.trackMaterial = material;
|
|
resolved = false;
|
|
}
|
|
|
|
public BezierConnection secondary() {
|
|
return new BezierConnection(tePositions.swap(), starts.swap(), axes.swap(), normals.swap(), !primary,
|
|
hasGirder, trackMaterial);
|
|
}
|
|
|
|
private static boolean coupleEquals(Couple<?> a, Couple<?> b) {
|
|
return (a.getFirst().equals(b.getFirst()) && a.getSecond().equals(b.getSecond()))
|
|
|| (a.getFirst() instanceof Vec3 aFirst && a.getSecond() instanceof Vec3 aSecond
|
|
&& b.getFirst() instanceof Vec3 bFirst && b.getSecond() instanceof Vec3 bSecond
|
|
&& aFirst.closerThan(bFirst, 1e-6) && aSecond.closerThan(bSecond, 1e-6));
|
|
}
|
|
|
|
public boolean equalsSansMaterial(BezierConnection other) {
|
|
return equalsSansMaterialInner(other) || equalsSansMaterialInner(other.secondary());
|
|
}
|
|
|
|
private boolean equalsSansMaterialInner(BezierConnection other) {
|
|
return this == other || (other != null && coupleEquals(this.tePositions, other.tePositions) && coupleEquals(this.starts, other.starts)
|
|
&& coupleEquals(this.axes, other.axes) && coupleEquals(this.normals, other.normals)
|
|
&& this.hasGirder == other.hasGirder);
|
|
}
|
|
|
|
public BezierConnection(CompoundTag compound, BlockPos localTo) {
|
|
this(Couple.deserializeEach(compound.getList("Positions", Tag.TAG_COMPOUND), NbtUtils::readBlockPos)
|
|
.map(b -> b.offset(localTo)),
|
|
Couple.deserializeEach(compound.getList("Starts", Tag.TAG_COMPOUND), VecHelper::readNBTCompound)
|
|
.map(v -> v.add(Vec3.atLowerCornerOf(localTo))),
|
|
Couple.deserializeEach(compound.getList("Axes", Tag.TAG_COMPOUND), VecHelper::readNBTCompound),
|
|
Couple.deserializeEach(compound.getList("Normals", Tag.TAG_COMPOUND), VecHelper::readNBTCompound),
|
|
compound.getBoolean("Primary"), compound.getBoolean("Girder"), TrackMaterial.deserialize(compound.getString("Material")));
|
|
}
|
|
|
|
public CompoundTag write(BlockPos localTo) {
|
|
Couple<BlockPos> tePositions = this.tePositions.map(b -> b.subtract(localTo));
|
|
Couple<Vec3> starts = this.starts.map(v -> v.subtract(Vec3.atLowerCornerOf(localTo)));
|
|
|
|
CompoundTag compound = new CompoundTag();
|
|
compound.putBoolean("Girder", hasGirder);
|
|
compound.putBoolean("Primary", primary);
|
|
compound.put("Positions", tePositions.serializeEach(NbtUtils::writeBlockPos));
|
|
compound.put("Starts", starts.serializeEach(VecHelper::writeNBTCompound));
|
|
compound.put("Axes", axes.serializeEach(VecHelper::writeNBTCompound));
|
|
compound.put("Normals", normals.serializeEach(VecHelper::writeNBTCompound));
|
|
compound.putString("Material", getMaterial().id.toString());
|
|
return compound;
|
|
}
|
|
|
|
public BezierConnection(FriendlyByteBuf buffer) {
|
|
this(Couple.create(buffer::readBlockPos), Couple.create(() -> VecHelper.read(buffer)),
|
|
Couple.create(() -> VecHelper.read(buffer)), Couple.create(() -> VecHelper.read(buffer)),
|
|
buffer.readBoolean(), buffer.readBoolean(), TrackMaterial.deserialize(buffer.readUtf()));
|
|
}
|
|
|
|
public void write(FriendlyByteBuf buffer) {
|
|
tePositions.forEach(buffer::writeBlockPos);
|
|
starts.forEach(v -> VecHelper.write(v, buffer));
|
|
axes.forEach(v -> VecHelper.write(v, buffer));
|
|
normals.forEach(v -> VecHelper.write(v, buffer));
|
|
buffer.writeBoolean(primary);
|
|
buffer.writeBoolean(hasGirder);
|
|
buffer.writeUtf(getMaterial().id.toString());
|
|
}
|
|
|
|
public BlockPos getKey() {
|
|
return tePositions.getSecond();
|
|
}
|
|
|
|
public boolean isPrimary() {
|
|
return primary;
|
|
}
|
|
|
|
// Runtime information
|
|
|
|
public double getLength() {
|
|
resolve();
|
|
return length;
|
|
}
|
|
|
|
public float[] getStepLUT() {
|
|
resolve();
|
|
return stepLUT;
|
|
}
|
|
|
|
public int getSegmentCount() {
|
|
resolve();
|
|
return segments;
|
|
}
|
|
|
|
public Vec3 getPosition(double t) {
|
|
resolve();
|
|
return VecHelper.bezier(starts.getFirst(), starts.getSecond(), finish1, finish2, (float) t);
|
|
}
|
|
|
|
public double getRadius() {
|
|
resolve();
|
|
return radius;
|
|
}
|
|
|
|
public double getHandleLength() {
|
|
resolve();
|
|
return handleLength;
|
|
}
|
|
|
|
public float getSegmentT(int index) {
|
|
return index == segments ? 1 : index * stepLUT[index] / segments;
|
|
}
|
|
|
|
public double incrementT(double currentT, double distance) {
|
|
resolve();
|
|
double dx =
|
|
VecHelper.bezierDerivative(starts.getFirst(), starts.getSecond(), finish1, finish2, (float) currentT)
|
|
.length() / getLength();
|
|
return currentT + distance / dx;
|
|
|
|
}
|
|
|
|
public AABB getBounds() {
|
|
resolve();
|
|
return bounds;
|
|
}
|
|
|
|
public Vec3 getNormal(double t) {
|
|
resolve();
|
|
Vec3 end1 = starts.getFirst();
|
|
Vec3 end2 = starts.getSecond();
|
|
Vec3 fn1 = normals.getFirst();
|
|
Vec3 fn2 = normals.getSecond();
|
|
|
|
Vec3 derivative = VecHelper.bezierDerivative(end1, end2, finish1, finish2, (float) t)
|
|
.normalize();
|
|
Vec3 faceNormal = fn1.equals(fn2) ? fn1 : VecHelper.slerp((float) t, fn1, fn2);
|
|
Vec3 normal = faceNormal.cross(derivative)
|
|
.normalize();
|
|
return derivative.cross(normal);
|
|
}
|
|
|
|
private void resolve() {
|
|
if (resolved)
|
|
return;
|
|
resolved = true;
|
|
|
|
Vec3 end1 = starts.getFirst();
|
|
Vec3 end2 = starts.getSecond();
|
|
Vec3 axis1 = axes.getFirst()
|
|
.normalize();
|
|
Vec3 axis2 = axes.getSecond()
|
|
.normalize();
|
|
|
|
determineHandles(end1, end2, axis1, axis2);
|
|
|
|
finish1 = axis1.scale(handleLength)
|
|
.add(end1);
|
|
finish2 = axis2.scale(handleLength)
|
|
.add(end2);
|
|
|
|
int scanCount = 16;
|
|
length = 0;
|
|
|
|
{
|
|
Vec3 previous = end1;
|
|
for (int i = 0; i <= scanCount; i++) {
|
|
float t = i / (float) scanCount;
|
|
Vec3 result = VecHelper.bezier(end1, end2, finish1, finish2, t);
|
|
if (previous != null)
|
|
length += result.distanceTo(previous);
|
|
previous = result;
|
|
}
|
|
}
|
|
|
|
segments = (int) (length * 2);
|
|
stepLUT = new float[segments + 1];
|
|
stepLUT[0] = 1;
|
|
float combinedDistance = 0;
|
|
|
|
bounds = new AABB(end1, end2);
|
|
|
|
// determine step lut
|
|
{
|
|
Vec3 previous = end1;
|
|
for (int i = 0; i <= segments; i++) {
|
|
float t = i / (float) segments;
|
|
Vec3 result = VecHelper.bezier(end1, end2, finish1, finish2, t);
|
|
bounds = bounds.minmax(new AABB(result, result));
|
|
if (i > 0) {
|
|
combinedDistance += result.distanceTo(previous) / length;
|
|
stepLUT[i] = (float) (t / combinedDistance);
|
|
}
|
|
previous = result;
|
|
}
|
|
}
|
|
|
|
bounds = bounds.inflate(1.375f);
|
|
}
|
|
|
|
private void determineHandles(Vec3 end1, Vec3 end2, Vec3 axis1, Vec3 axis2) {
|
|
Vec3 cross1 = axis1.cross(new Vec3(0, 1, 0));
|
|
Vec3 cross2 = axis2.cross(new Vec3(0, 1, 0));
|
|
|
|
radius = 0;
|
|
double a1 = Mth.atan2(-axis2.z, -axis2.x);
|
|
double a2 = Mth.atan2(axis1.z, axis1.x);
|
|
double angle = a1 - a2;
|
|
|
|
float circle = 2 * Mth.PI;
|
|
angle = (angle + circle) % circle;
|
|
if (Math.abs(circle - angle) < Math.abs(angle))
|
|
angle = circle - angle;
|
|
|
|
if (Mth.equal(angle, 0)) {
|
|
double[] intersect = VecHelper.intersect(end1, end2, axis1, cross2, Axis.Y);
|
|
if (intersect != null) {
|
|
double t = Math.abs(intersect[0]);
|
|
double u = Math.abs(intersect[1]);
|
|
double min = Math.min(t, u);
|
|
double max = Math.max(t, u);
|
|
|
|
if (min > 1.2 && max / min > 1 && max / min < 3) {
|
|
handleLength = (max - min);
|
|
return;
|
|
}
|
|
}
|
|
|
|
handleLength = end2.distanceTo(end1) / 3;
|
|
return;
|
|
}
|
|
|
|
double n = circle / angle;
|
|
double factor = 4 / 3d * Math.tan(Math.PI / (2 * n));
|
|
double[] intersect = VecHelper.intersect(end1, end2, cross1, cross2, Axis.Y);
|
|
|
|
if (intersect == null) {
|
|
handleLength = end2.distanceTo(end1) / 3;
|
|
return;
|
|
}
|
|
|
|
radius = Math.abs(intersect[1]);
|
|
handleLength = radius * factor;
|
|
if (Mth.equal(handleLength, 0))
|
|
handleLength = 1;
|
|
}
|
|
|
|
@Override
|
|
public Iterator<Segment> iterator() {
|
|
resolve();
|
|
var offset = Vec3.atLowerCornerOf(tePositions.getFirst())
|
|
.scale(-1)
|
|
.add(0, 3 / 16f, 0);
|
|
return new Bezierator(this, offset);
|
|
}
|
|
|
|
public void addItemsToPlayer(Player player) {
|
|
Inventory inv = player.getInventory();
|
|
int tracks = getTrackItemCost();
|
|
while (tracks > 0) {
|
|
inv.placeItemBackInInventory(new ItemStack(getMaterial().getTrackBlock().get(), Math.min(64, tracks)));
|
|
tracks -= 64;
|
|
}
|
|
int girders = getGirderItemCost();
|
|
while (girders > 0) {
|
|
inv.placeItemBackInInventory(AllBlocks.METAL_GIRDER.asStack(Math.min(64, girders)));
|
|
girders -= 64;
|
|
}
|
|
}
|
|
|
|
public int getGirderItemCost() {
|
|
return hasGirder ? getTrackItemCost() * 2 : 0;
|
|
}
|
|
|
|
public int getTrackItemCost() {
|
|
return (getSegmentCount() + 1) / 2;
|
|
}
|
|
|
|
public void spawnItems(Level level) {
|
|
if (!level.getGameRules()
|
|
.getBoolean(GameRules.RULE_DOBLOCKDROPS))
|
|
return;
|
|
Vec3 origin = Vec3.atLowerCornerOf(tePositions.getFirst());
|
|
for (Segment segment : this) {
|
|
if (segment.index % 2 != 0 || segment.index == getSegmentCount())
|
|
continue;
|
|
Vec3 v = VecHelper.offsetRandomly(segment.position, level.random, .125f)
|
|
.add(origin);
|
|
ItemEntity entity = new ItemEntity(level, v.x, v.y, v.z, new ItemStack(getMaterial().getTrackBlock().get()));
|
|
entity.setDefaultPickUpDelay();
|
|
level.addFreshEntity(entity);
|
|
if (!hasGirder)
|
|
continue;
|
|
for (int i = 0; i < 2; i++) {
|
|
entity = new ItemEntity(level, v.x, v.y, v.z, AllBlocks.METAL_GIRDER.asStack());
|
|
entity.setDefaultPickUpDelay();
|
|
level.addFreshEntity(entity);
|
|
}
|
|
}
|
|
}
|
|
|
|
public void spawnDestroyParticles(Level level) {
|
|
BlockParticleOption data = new BlockParticleOption(ParticleTypes.BLOCK, getMaterial().getTrackBlock().get().defaultBlockState());
|
|
BlockParticleOption girderData =
|
|
new BlockParticleOption(ParticleTypes.BLOCK, AllBlocks.METAL_GIRDER.getDefaultState());
|
|
if (!(level instanceof ServerLevel slevel))
|
|
return;
|
|
Vec3 origin = Vec3.atLowerCornerOf(tePositions.getFirst());
|
|
for (Segment segment : this) {
|
|
for (int offset : Iterate.positiveAndNegative) {
|
|
Vec3 v = segment.position.add(segment.normal.scale(14 / 16f * offset))
|
|
.add(origin);
|
|
slevel.sendParticles(data, v.x, v.y, v.z, 1, 0, 0, 0, 0);
|
|
if (!hasGirder)
|
|
continue;
|
|
slevel.sendParticles(girderData, v.x, v.y - .5f, v.z, 1, 0, 0, 0, 0);
|
|
}
|
|
}
|
|
}
|
|
|
|
public TrackMaterial getMaterial() {
|
|
return trackMaterial;
|
|
}
|
|
|
|
public void setMaterial(TrackMaterial material) {
|
|
trackMaterial = material;
|
|
}
|
|
|
|
public static class Segment {
|
|
|
|
public int index;
|
|
public Vec3 position;
|
|
public Vec3 derivative;
|
|
public Vec3 faceNormal;
|
|
public Vec3 normal;
|
|
|
|
}
|
|
|
|
private static class Bezierator implements Iterator<Segment> {
|
|
|
|
private final BezierConnection bc;
|
|
private final Segment segment;
|
|
private final Vec3 end1;
|
|
private final Vec3 end2;
|
|
private final Vec3 finish1;
|
|
private final Vec3 finish2;
|
|
private final Vec3 faceNormal1;
|
|
private final Vec3 faceNormal2;
|
|
|
|
private Bezierator(BezierConnection bc, Vec3 offset) {
|
|
bc.resolve();
|
|
this.bc = bc;
|
|
|
|
end1 = bc.starts.getFirst()
|
|
.add(offset);
|
|
end2 = bc.starts.getSecond()
|
|
.add(offset);
|
|
|
|
finish1 = bc.axes.getFirst()
|
|
.scale(bc.handleLength)
|
|
.add(end1);
|
|
finish2 = bc.axes.getSecond()
|
|
.scale(bc.handleLength)
|
|
.add(end2);
|
|
|
|
faceNormal1 = bc.normals.getFirst();
|
|
faceNormal2 = bc.normals.getSecond();
|
|
segment = new Segment();
|
|
segment.index = -1; // will get incremented to 0 in #next()
|
|
}
|
|
|
|
@Override
|
|
public boolean hasNext() {
|
|
return segment.index + 1 <= bc.segments;
|
|
}
|
|
|
|
@Override
|
|
public Segment next() {
|
|
segment.index++;
|
|
float t = this.bc.getSegmentT(segment.index);
|
|
segment.position = VecHelper.bezier(end1, end2, finish1, finish2, t);
|
|
segment.derivative = VecHelper.bezierDerivative(end1, end2, finish1, finish2, t)
|
|
.normalize();
|
|
segment.faceNormal =
|
|
faceNormal1.equals(faceNormal2) ? faceNormal1 : VecHelper.slerp(t, faceNormal1, faceNormal2);
|
|
segment.normal = segment.faceNormal.cross(segment.derivative)
|
|
.normalize();
|
|
return segment;
|
|
}
|
|
}
|
|
|
|
private SegmentAngles[] bakedSegments;
|
|
private GirderAngles[] bakedGirders;
|
|
|
|
@OnlyIn(Dist.CLIENT)
|
|
public static class SegmentAngles {
|
|
|
|
public Pose tieTransform;
|
|
public Couple<Pose> railTransforms;
|
|
public BlockPos lightPosition;
|
|
|
|
}
|
|
|
|
@OnlyIn(Dist.CLIENT)
|
|
public static class GirderAngles {
|
|
|
|
public Couple<Pose> beams;
|
|
public Couple<Couple<Pose>> beamCaps;
|
|
public BlockPos lightPosition;
|
|
|
|
}
|
|
|
|
@OnlyIn(Dist.CLIENT)
|
|
public SegmentAngles[] getBakedSegments() {
|
|
if (bakedSegments != null)
|
|
return bakedSegments;
|
|
|
|
int segmentCount = getSegmentCount();
|
|
bakedSegments = new SegmentAngles[segmentCount + 1];
|
|
Couple<Vec3> previousOffsets = null;
|
|
|
|
for (BezierConnection.Segment segment : this) {
|
|
int i = segment.index;
|
|
boolean end = i == 0 || i == segmentCount;
|
|
|
|
SegmentAngles angles = bakedSegments[i] = new SegmentAngles();
|
|
Couple<Vec3> railOffsets = Couple.create(segment.position.add(segment.normal.scale(.965f)),
|
|
segment.position.subtract(segment.normal.scale(.965f)));
|
|
Vec3 railMiddle = railOffsets.getFirst()
|
|
.add(railOffsets.getSecond())
|
|
.scale(.5);
|
|
|
|
if (previousOffsets == null) {
|
|
previousOffsets = railOffsets;
|
|
continue;
|
|
}
|
|
|
|
// Tie
|
|
Vec3 prevMiddle = previousOffsets.getFirst()
|
|
.add(previousOffsets.getSecond())
|
|
.scale(.5);
|
|
Vec3 tieAngles = TrackRenderer.getModelAngles(segment.normal, railMiddle.subtract(prevMiddle));
|
|
angles.lightPosition = new BlockPos(railMiddle);
|
|
angles.railTransforms = Couple.create(null, null);
|
|
|
|
PoseStack poseStack = new PoseStack();
|
|
TransformStack.cast(poseStack)
|
|
.translate(prevMiddle)
|
|
.rotateYRadians(tieAngles.y)
|
|
.rotateXRadians(tieAngles.x)
|
|
.rotateZRadians(tieAngles.z)
|
|
.translate(-1 / 2f, -2 / 16f - 1 / 256f, 0);
|
|
angles.tieTransform = poseStack.last();
|
|
|
|
// Rails
|
|
float scale = end ? 2.2f : 2.1f;
|
|
for (boolean first : Iterate.trueAndFalse) {
|
|
Vec3 railI = railOffsets.get(first);
|
|
Vec3 prevI = previousOffsets.get(first);
|
|
Vec3 diff = railI.subtract(prevI);
|
|
Vec3 anglesI = TrackRenderer.getModelAngles(segment.normal, diff);
|
|
|
|
poseStack = new PoseStack();
|
|
TransformStack.cast(poseStack)
|
|
.translate(prevI)
|
|
.rotateYRadians(anglesI.y)
|
|
.rotateXRadians(anglesI.x)
|
|
.rotateZRadians(anglesI.z)
|
|
.translate(0, -2 / 16f + (i % 2 == 0 ? 1 : -1) / 2048f - 1 / 256f, -1 / 32f)
|
|
.scale(1, 1, (float) diff.length() * scale);
|
|
angles.railTransforms.set(first, poseStack.last());
|
|
}
|
|
|
|
previousOffsets = railOffsets;
|
|
}
|
|
|
|
return bakedSegments;
|
|
}
|
|
|
|
@OnlyIn(Dist.CLIENT)
|
|
public GirderAngles[] getBakedGirders() {
|
|
if (bakedGirders != null)
|
|
return bakedGirders;
|
|
|
|
int segmentCount = getSegmentCount();
|
|
bakedGirders = new GirderAngles[segmentCount + 1];
|
|
Couple<Couple<Vec3>> previousOffsets = null;
|
|
|
|
for (BezierConnection.Segment segment : this) {
|
|
int i = segment.index;
|
|
boolean end = i == 0 || i == segmentCount;
|
|
GirderAngles angles = bakedGirders[i] = new GirderAngles();
|
|
|
|
Vec3 leftGirder = segment.position.add(segment.normal.scale(.965f));
|
|
Vec3 rightGirder = segment.position.subtract(segment.normal.scale(.965f));
|
|
Vec3 upNormal = segment.derivative.normalize()
|
|
.cross(segment.normal);
|
|
Vec3 firstGirderOffset = upNormal.scale(-8 / 16f);
|
|
Vec3 secondGirderOffset = upNormal.scale(-10 / 16f);
|
|
Vec3 leftTop = segment.position.add(segment.normal.scale(1))
|
|
.add(firstGirderOffset);
|
|
Vec3 rightTop = segment.position.subtract(segment.normal.scale(1))
|
|
.add(firstGirderOffset);
|
|
Vec3 leftBottom = leftTop.add(secondGirderOffset);
|
|
Vec3 rightBottom = rightTop.add(secondGirderOffset);
|
|
|
|
angles.lightPosition = new BlockPos(leftGirder.add(rightGirder)
|
|
.scale(.5));
|
|
|
|
Couple<Couple<Vec3>> offsets =
|
|
Couple.create(Couple.create(leftTop, rightTop), Couple.create(leftBottom, rightBottom));
|
|
|
|
if (previousOffsets == null) {
|
|
previousOffsets = offsets;
|
|
continue;
|
|
}
|
|
|
|
angles.beams = Couple.create(null, null);
|
|
angles.beamCaps = Couple.create(Couple.create(null, null), Couple.create(null, null));
|
|
float scale = end ? 2.3f : 2.2f;
|
|
|
|
for (boolean first : Iterate.trueAndFalse) {
|
|
|
|
// Middle
|
|
Vec3 currentBeam = offsets.getFirst()
|
|
.get(first)
|
|
.add(offsets.getSecond()
|
|
.get(first))
|
|
.scale(.5);
|
|
Vec3 previousBeam = previousOffsets.getFirst()
|
|
.get(first)
|
|
.add(previousOffsets.getSecond()
|
|
.get(first))
|
|
.scale(.5);
|
|
Vec3 beamDiff = currentBeam.subtract(previousBeam);
|
|
Vec3 beamAngles = TrackRenderer.getModelAngles(segment.normal, beamDiff);
|
|
|
|
PoseStack poseStack = new PoseStack();
|
|
TransformStack.cast(poseStack)
|
|
.translate(previousBeam)
|
|
.rotateYRadians(beamAngles.y)
|
|
.rotateXRadians(beamAngles.x)
|
|
.rotateZRadians(beamAngles.z)
|
|
.translate(0, 2 / 16f + (segment.index % 2 == 0 ? 1 : -1) / 2048f - 1 / 1024f, -1 / 32f)
|
|
.scale(1, 1, (float) beamDiff.length() * scale);
|
|
angles.beams.set(first, poseStack.last());
|
|
|
|
// Caps
|
|
for (boolean top : Iterate.trueAndFalse) {
|
|
Vec3 current = offsets.get(top)
|
|
.get(first);
|
|
Vec3 previous = previousOffsets.get(top)
|
|
.get(first);
|
|
Vec3 diff = current.subtract(previous);
|
|
Vec3 capAngles = TrackRenderer.getModelAngles(segment.normal, diff);
|
|
|
|
poseStack = new PoseStack();
|
|
TransformStack.cast(poseStack)
|
|
.translate(previous)
|
|
.rotateYRadians(capAngles.y)
|
|
.rotateXRadians(capAngles.x)
|
|
.rotateZRadians(capAngles.z)
|
|
.translate(0, 2 / 16f + (segment.index % 2 == 0 ? 1 : -1) / 2048f - 1 / 1024f, -1 / 32f)
|
|
.rotateZ(top ? 0 : 0)
|
|
.scale(1, 1, (float) diff.length() * scale);
|
|
angles.beamCaps.get(top)
|
|
.set(first, poseStack.last());
|
|
}
|
|
}
|
|
|
|
previousOffsets = offsets;
|
|
|
|
}
|
|
|
|
return bakedGirders;
|
|
}
|
|
|
|
}
|