mirror of
https://github.com/Creators-of-Create/Create.git
synced 2025-01-11 23:07:13 +01:00
Squashed commit of the following:
commit 4323a7133ae29f204bfc34b373ef4946a435e775
Author: simibubi <31564874+simibubi@users.noreply.github.com>
Date: Wed May 10 10:58:12 2023 +0200
Deferred validBlocks() option for block entities
commit b79330f4efe14746f0c2b35f13469862e148f88c
Merge: 053dd09df 7cc35698a
Author: simibubi <31564874+simibubi@users.noreply.github.com>
Date: Wed May 10 10:23:33 2023 +0200
Merge branch '1.18/api' of https://github.com/Layers-of-Railways/Create into pr/4692
commit 7cc35698ae
Merge: bae824487 ecc645eba
Author: techno-sam <linux.techno.sam@gmail.com>
Date: Tue May 9 20:15:15 2023 -0700
Merge remote-tracking branch 'origin/1.18/api' into 1.18/api
commit bae8244873
Author: techno-sam <linux.techno.sam@gmail.com>
Date: Tue May 9 20:15:00 2023 -0700
resolve review issues
commit b1bffbf7fd
Author: techno-sam <linux.techno.sam@gmail.com>
Date: Tue May 9 19:46:58 2023 -0700
clean up testing residue
commit 053dd09df6c426ab5e570f42a1edb5df3d0fbd01
Merge: 6d1e1c71d ecc645eba
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
commit ecc645eba7
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
commit 205e47352e
Author: techno-sam <linux.techno.sam@gmail.com>
Date: Mon May 8 21:02:19 2023 -0700
Fix up ItemOutline
commit 6cf204f6af
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
commit fe049bc771
Author: techno-sam <linux.techno.sam@gmail.com>
Date: Mon May 8 20:26:16 2023 -0700
Revert "Revert "Rewrite outline buffering""
This reverts commit 726bfaf0
commit 435b4c1c16
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
commit 662da6bab1
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
commit 122fe77afa
Author: techno-sam <linux.techno.sam@gmail.com>
Date: Mon May 8 20:15:46 2023 -0700
Fix up upside down rendering
commit d83285e8a4
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
commit cdb0ad210b
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Sun May 7 10:15:47 2023 +0100
Fixed merge artifact
commit 457d5f33ed
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
commit 00e953a585
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
commit a7a25896c1
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
commit 4e4e227a35
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Sun May 7 10:10:30 2023 +0100
Cleanup to cycle groups
commit aa94fc97d1
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Sun May 7 09:50:50 2023 +0100
Removed unused import of Railways
commit 7622128bec
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
commit 1e4d5504ee
Author: techno-sam <linux.techno.sam@gmail.com>
Date: Sat May 6 18:03:39 2023 -0700
Don't revert non-buggy changes
commit b306cf2124
Author: techno-sam <linux.techno.sam@gmail.com>
Date: Sat May 6 18:00:59 2023 -0700
Take materials into consideration when trains pathfind
commit fca02ae4bf
Author: techno-sam <linux.techno.sam@gmail.com>
Date: Sat May 6 10:25:51 2023 -0700
Add materials to track graph
commit 726bfaf0b5
Author: techno-sam <linux.techno.sam@gmail.com>
Date: Fri May 5 21:16:49 2023 -0700
Revert "Rewrite outline buffering"
This reverts commit d4106d545b.
commit 171897bed2
Author: techno-sam <linux.techno.sam@gmail.com>
Date: Fri May 5 20:55:25 2023 -0700
Fix up style cycling
commit cbd0cf20da
Author: techno-sam <linux.techno.sam@gmail.com>
Date: Fri May 5 07:32:06 2023 -0700
clean up nether portal carriage handling
commit d556f08876
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
commit da26c0ccbf
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
commit 81eeadb853
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Mon May 1 16:15:28 2023 +0100
Small cleanup
commit c7e9df973c
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Mon May 1 16:13:51 2023 +0100
Fixed issue raised in #1
commit 2f285b6eb7
Author: techno-sam <linux.techno.sam@gmail.com>
Date: Mon May 1 08:13:27 2023 -0700
add data gen
commit 206de01311
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
commit 6564f4fa73
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
commit e5d7595822
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Mon May 1 10:09:03 2023 +0100
Connected Custom Bogey Particle Types To CarriageParticles
commit e91753a33c
Author: techno-sam <linux.techno.sam@gmail.com>
Date: Sun Apr 30 19:51:26 2023 -0700
Fix up some problems
commit 9815f1490f
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Sun Apr 30 21:12:43 2023 +0100
Implemented default data when shifting styles
commit da30e78815
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Sun Apr 30 21:12:14 2023 +0100
Added Particles To Bogey Style (And Respective Builder)
commit 08c000b8ba
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Sun Apr 30 21:01:19 2023 +0100
Added Backup Rendering If A Size Is Not Present
commit 2b76e8d7b3
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Sun Apr 30 21:00:40 2023 +0100
Added Common Renderer To Remove Function
commit 411ec36f57
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Sun Apr 30 20:59:50 2023 +0100
Added Display Name To Standard Bogey Style
commit 112306d5d4
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Sun Apr 30 20:59:30 2023 +0100
Displayed new style name when changing betweeen them
commit 5634670b27
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Sun Apr 30 20:06:00 2023 +0100
General Cleanup
commit 0f7a8b7b24
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Sun Apr 30 20:05:50 2023 +0100
Implemented Changes To Remaining Classes
commit 8aedc00f96
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Sun Apr 30 20:02:06 2023 +0100
Removed Bogey Style Handling From Registrate
commit edf8079abf
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Sun Apr 30 20:01:40 2023 +0100
Removed Unused Registry Handling
commit 6a185c4e72
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Sun Apr 30 20:01:16 2023 +0100
Refactored Bogey Sizes
commit e10d07ddc3
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Sun Apr 30 20:01:00 2023 +0100
Overhauled Bogey Style
commit 74d98a2ad5
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
commit e629d02f50
Author: techno-sam <linux.techno.sam@gmail.com>
Date: Sun Apr 9 07:18:22 2023 -0700
Track API
Clean up code a bit
commit d9ce6ce995
Author: techno-sam <linux.techno.sam@gmail.com>
Date: Sun Apr 9 07:14:46 2023 -0700
Track API?
Fix placement
commit 7fbf08ba54
Author: techno-sam <linux.techno.sam@gmail.com>
Date: Sat Apr 8 11:11:24 2023 -0700
Track API?
Fix up some placement issues
commit 35644f1434
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
commit f7c56b867a
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
commit 2a59fd7e8a
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
commit 5ba30d6a85
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
commit d52065808c
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
commit 53240bd42f
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Mon Apr 3 21:42:29 2023 +0100
Corrected Bogey InteractionResult To Pass
commit 69326e361a
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Mon Apr 3 21:30:28 2023 +0100
Fixed Default Values When Used Styles Are Removed
commit 4f176979de
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Mon Apr 3 19:33:17 2023 +0100
Fixed Carriage Sounds (Again)
commit 1e80af3303
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Mon Apr 3 19:27:58 2023 +0100
Refactored Bogey Sizes To Seperate Class
commit 129be61fee
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Mon Apr 3 17:20:17 2023 +0100
Fixed Bogey Sound Loading
commit 2543185a55
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Mon Apr 3 09:45:23 2023 +0100
Added Bogey Sound Customisation
commit 1ad5ae9514
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
commit 96566b1614
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
commit eedd984738
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Sun Apr 2 16:53:55 2023 +0100
Fixed Large Bogey Size
commit 68ca0974c6
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Sun Apr 2 16:47:58 2023 +0100
Implemented Style Cycling & Default Values
commit a55ba4267a
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Sun Apr 2 16:46:15 2023 +0100
Implemented renderer instance creator
commit 43523302c2
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Sun Apr 2 16:45:33 2023 +0100
Removed Unused Standard Bogey Instance
commit 773e084422
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
commit 0c0b5a1ed6
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Sat Apr 1 18:39:58 2023 +0100
Linked Style Registry To Bogey Blocks
commit 71f839ee51
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Sat Apr 1 18:39:03 2023 +0100
Replaced size boolean with direct use of size enum
commit 50ff081704
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Thu Mar 30 18:47:13 2023 +0100
Added Resource Location To NBT helper methods
commit d1e1f7ec5a
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Thu Mar 30 18:47:13 2023 +0100
Re-worked BogeyStyles
commit da593fccb1
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Thu Mar 30 18:46:02 2023 +0100
Refactored IBogeyBlock to AbstractBogeyBlock and extracted relevant StandardBogeyBlock implementations
commit 17432c9113
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Sat Mar 25 10:20:50 2023 +0000
Fixed Incorrect Registry Loading
commit c7d899369a
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Fri Mar 24 23:44:03 2023 +0000
Registered Registers
commit 6d862290d7
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Fri Mar 24 23:43:23 2023 +0000
Added BogeyStyleBuilder To Registrate
commit 3dfb9e3b3b
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Fri Mar 24 23:43:08 2023 +0000
Implemented AllBogeyStyles
commit c9e71b462d
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Fri Mar 24 23:42:56 2023 +0000
Created BogeyStyleBuilder
commit a90977d642
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Fri Mar 24 23:42:25 2023 +0000
Created AllRegistries and BogeyStyle Registry
commit 154d455f3f
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Fri Mar 24 23:41:56 2023 +0000
Added BogeyStyle Wrapper
commit dfb7640bfc
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Thu Mar 23 18:50:41 2023 +0000
Removed left over logging statement
commit 9920536cc3
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Thu Mar 23 18:50:18 2023 +0000
Implemented Secondary Shaft To Large Renderer
commit 6cd40cc6f9
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
commit 06fb901144
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Thu Mar 23 18:39:11 2023 +0000
Implemented Common Rendering For StandardBogeyRenderer
commit 435b0f8266
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Thu Mar 23 18:38:40 2023 +0000
Added Common Renderer
commit 96a0623dab
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Thu Mar 23 18:38:29 2023 +0000
Implemented BlockState Models For Rendering
commit 469d9d592b
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Thu Mar 23 17:42:28 2023 +0000
Added Standard Bogey Instance (Might be redundant)
commit 2661d260d8
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Thu Mar 23 17:42:06 2023 +0000
Refactored Changes To Existing Methods
commit 9ded16fbab
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Thu Mar 23 17:41:15 2023 +0000
Integrated BogeyRenderer To BogeyInstance (Also Corrected Rendering In Contraption)
commit 4a82fcbca1
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Thu Mar 23 17:40:13 2023 +0000
Implemented Changes To StandardBogeyBlock
commit 7238fb93f3
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Thu Mar 23 17:39:51 2023 +0000
Added Renderer To IBogeyBlock
commit ded4c1f613
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
commit 91727cc84a
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Wed Mar 22 17:03:28 2023 +0000
Implemented Model Data Initializer to StandardBogeyRenderer
commit 6d98a1f469
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Wed Mar 22 17:03:00 2023 +0000
Added Contraption Model Instance Initializer
commit 3c02fe6ecc
Author: Rabbitminers <79579164+Rabbitminers@users.noreply.github.com>
Date: Tue Mar 21 22:45:34 2023 +0000
Added missing render type check
commit 6672c49649
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Tue Mar 21 22:37:36 2023 +0000
Re-created standard bogey with test api
commit a8a9491fa0
Author: Rabbitminers <Rabbitminers2.0@gmail.com>
Date: Tue Mar 21 22:34:54 2023 +0000
Implemented Proof Of Concept Generic Bogey Renderer
commit e4e5ac1c40
Author: SpottyTheTurtle <69260662+SpottyTheTurtle@users.noreply.github.com>
Date: Sat Mar 11 21:34:59 2023 +0000
init
This commit is contained in:
simibubi
parent
e5c6ca157c
commit
fe713b1966
11 changed files with 110 additions and 57 deletions
|
|
@ -785,8 +785,8 @@ public class AllTileEntities {
|
|||
public static final BlockEntityEntry<TrackTileEntity> TRACK = REGISTRATE
|
||||
.tileEntity("track", TrackTileEntity::new)
|
||||
.instance(() -> TrackInstance::new)
|
||||
.validBlocksDeferred(TrackMaterial::allBlocks)
|
||||
.renderer(() -> TrackRenderer::new)
|
||||
.validBlocks((NonNullSupplier<? extends TrackBlock>[]) TrackMaterial.allBlocks().toArray(new NonNullSupplier[0]))
|
||||
.register();
|
||||
|
||||
public static final BlockEntityEntry<FakeTrackTileEntity> FAKE_TRACK = REGISTRATE
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ public class BlueprintOverlayRenderer {
|
|||
|
||||
int tracks = info.requiredTracks;
|
||||
while (tracks > 0) {
|
||||
ingredients.add(Pair.of(new ItemStack(info.trackMaterial.getTrackBlock().get(), Math.min(64, tracks)), info.hasRequiredTracks));
|
||||
ingredients.add(Pair.of(new ItemStack(info.trackMaterial.getBlock(), Math.min(64, tracks)), info.hasRequiredTracks));
|
||||
tracks -= 64;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -322,7 +322,7 @@ public class BezierConnection implements Iterable<BezierConnection.Segment> {
|
|||
Inventory inv = player.getInventory();
|
||||
int tracks = getTrackItemCost();
|
||||
while (tracks > 0) {
|
||||
inv.placeItemBackInInventory(new ItemStack(getMaterial().getTrackBlock().get(), Math.min(64, tracks)));
|
||||
inv.placeItemBackInInventory(new ItemStack(getMaterial().getBlock(), Math.min(64, tracks)));
|
||||
tracks -= 64;
|
||||
}
|
||||
int girders = getGirderItemCost();
|
||||
|
|
@ -350,7 +350,7 @@ public class BezierConnection implements Iterable<BezierConnection.Segment> {
|
|||
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()));
|
||||
ItemEntity entity = new ItemEntity(level, v.x, v.y, v.z, getMaterial().asStack());
|
||||
entity.setDefaultPickUpDelay();
|
||||
level.addFreshEntity(entity);
|
||||
if (!hasGirder)
|
||||
|
|
@ -364,7 +364,7 @@ public class BezierConnection implements Iterable<BezierConnection.Segment> {
|
|||
}
|
||||
|
||||
public void spawnDestroyParticles(Level level) {
|
||||
BlockParticleOption data = new BlockParticleOption(ParticleTypes.BLOCK, getMaterial().getTrackBlock().get().defaultBlockState());
|
||||
BlockParticleOption data = new BlockParticleOption(ParticleTypes.BLOCK, getMaterial().getBlock().defaultBlockState());
|
||||
BlockParticleOption girderData =
|
||||
new BlockParticleOption(ParticleTypes.BLOCK, AllBlocks.METAL_GIRDER.getDefaultState());
|
||||
if (!(level instanceof ServerLevel slevel))
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ public class BogeySizes {
|
|||
return BOGEY_SIZES.size();
|
||||
}
|
||||
|
||||
public record BogeySize(ResourceLocation location, Float wheelRadius) {
|
||||
public record BogeySize(ResourceLocation location, float wheelRadius) {
|
||||
public BogeySize(String modId, String name, float wheelRadius) {
|
||||
this(new ResourceLocation(modId, name), wheelRadius);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,15 +5,6 @@ import java.util.Map;
|
|||
import java.util.Map.Entry;
|
||||
import java.util.UUID;
|
||||
|
||||
import com.mojang.blaze3d.vertex.PoseStack;
|
||||
|
||||
import net.minecraft.client.renderer.block.model.ItemTransforms;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
|
||||
import net.minecraft.world.item.Items;
|
||||
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
|
||||
import org.lwjgl.glfw.GLFW;
|
||||
|
||||
import com.simibubi.create.AllKeys;
|
||||
|
|
@ -274,7 +265,7 @@ public class TrackGraphVisualizer {
|
|||
if (extended) {
|
||||
Vec3 materialPos = edge.getPosition(0.5).add(0, 1, 0);
|
||||
CreateClient.OUTLINER.showItem(Pair.of(edge, edge.edgeData), materialPos,
|
||||
new ItemStack(edge.getTrackMaterial().trackBlock.get().get()));
|
||||
edge.getTrackMaterial().asStack());
|
||||
CreateClient.OUTLINER.showAABB(edge.edgeData, AABB.ofSize(materialPos, 1, 1, 1))
|
||||
.colored(graph.color);
|
||||
}
|
||||
|
|
@ -292,7 +283,7 @@ public class TrackGraphVisualizer {
|
|||
if (extended) {
|
||||
Vec3 materialPos = edge.getPosition(0.5).add(0, 1, 0);
|
||||
CreateClient.OUTLINER.showItem(Pair.of(edge, edge.edgeData), materialPos,
|
||||
new ItemStack(edge.getTrackMaterial().trackBlock.get().get()));
|
||||
edge.getTrackMaterial().asStack());
|
||||
CreateClient.OUTLINER.showAABB(edge.edgeData, AABB.ofSize(materialPos, 1, 1, 1))
|
||||
.colored(graph.color);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@ import java.util.List;
|
|||
import java.util.Map;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import com.jozufozu.flywheel.core.PartialModel;
|
||||
import com.simibubi.create.AllBlockPartials;
|
||||
import com.simibubi.create.AllBlocks;
|
||||
|
|
@ -18,7 +20,9 @@ import com.tterrag.registrate.util.nullness.NonNullSupplier;
|
|||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.item.BlockItem;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.crafting.Ingredient;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraft.world.level.block.state.BlockBehaviour;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
|
|
@ -42,6 +46,9 @@ public class TrackMaterial {
|
|||
public final ResourceLocation particle;
|
||||
public final TrackType trackType;
|
||||
|
||||
@Nullable
|
||||
private final TrackMaterial.TrackType.TrackBlockFactory customFactory;
|
||||
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
protected TrackModelHolder modelHolder;
|
||||
|
||||
|
|
@ -53,6 +60,13 @@ public class TrackMaterial {
|
|||
public TrackMaterial(ResourceLocation id, String langName, NonNullSupplier<NonNullSupplier<? extends TrackBlock>> trackBlock,
|
||||
ResourceLocation particle, Ingredient sleeperIngredient, Ingredient railsIngredient,
|
||||
TrackType trackType, Supplier<Supplier<TrackModelHolder>> modelHolder) {
|
||||
this(id, langName, trackBlock, particle, sleeperIngredient, railsIngredient, trackType, modelHolder, null);
|
||||
}
|
||||
|
||||
public TrackMaterial(ResourceLocation id, String langName, NonNullSupplier<NonNullSupplier<? extends TrackBlock>> trackBlock,
|
||||
ResourceLocation particle, Ingredient sleeperIngredient, Ingredient railsIngredient,
|
||||
TrackType trackType, Supplier<Supplier<TrackModelHolder>> modelHolder,
|
||||
@Nullable TrackType.TrackBlockFactory customFactory) {
|
||||
this.id = id;
|
||||
this.langName = langName;
|
||||
this.trackBlock = trackBlock;
|
||||
|
|
@ -60,38 +74,52 @@ public class TrackMaterial {
|
|||
this.railsIngredient = railsIngredient;
|
||||
this.particle = particle;
|
||||
this.trackType = trackType;
|
||||
this.customFactory = customFactory;
|
||||
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> this.modelHolder = modelHolder.get().get());
|
||||
ALL.put(this.id, this);
|
||||
}
|
||||
|
||||
public NonNullSupplier<? extends TrackBlock> getTrackBlock() {
|
||||
public NonNullSupplier<? extends TrackBlock> getBlockSupplier() {
|
||||
return this.trackBlock.get();
|
||||
}
|
||||
|
||||
public TrackBlock createBlock(BlockBehaviour.Properties properties) {
|
||||
return this.trackType.factory.create(properties, this);
|
||||
public TrackBlock getBlock() {
|
||||
return getBlockSupplier().get();
|
||||
}
|
||||
|
||||
public boolean isCustom(String modId) {
|
||||
public ItemStack asStack() {
|
||||
return asStack(1);
|
||||
}
|
||||
|
||||
public ItemStack asStack(int count) {
|
||||
return new ItemStack(getBlock(), count);
|
||||
}
|
||||
|
||||
public TrackBlock createBlock(BlockBehaviour.Properties properties) {
|
||||
return (this.customFactory != null ? this.customFactory : this.trackType.factory)
|
||||
.create(properties, this);
|
||||
}
|
||||
|
||||
public boolean isFromMod(String modId) {
|
||||
return this.id.getNamespace().equals(modId);
|
||||
}
|
||||
|
||||
public static TrackMaterial[] allCustom(String modid) {
|
||||
return ALL.values().stream().filter(tm -> tm.isCustom(modid)).toArray(TrackMaterial[]::new);
|
||||
public static List<TrackMaterial> allFromMod(String modid) {
|
||||
return ALL.values().stream().filter(tm -> tm.isFromMod(modid)).toList();
|
||||
}
|
||||
|
||||
public static List<NonNullSupplier<? extends TrackBlock>> allCustomBlocks(String modid) {
|
||||
List<NonNullSupplier<? extends TrackBlock>> list = new ArrayList<>();
|
||||
for (TrackMaterial material : allCustom(modid)) {
|
||||
list.add(material.getTrackBlock());
|
||||
public static List<NonNullSupplier<? extends Block>> allBlocksFromMod(String modid) {
|
||||
List<NonNullSupplier<? extends Block>> list = new ArrayList<>();
|
||||
for (TrackMaterial material : allFromMod(modid)) {
|
||||
list.add(material.getBlockSupplier());
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
public static List<NonNullSupplier<? extends TrackBlock>> allBlocks() {
|
||||
List<NonNullSupplier<? extends TrackBlock>> list = new ArrayList<>();
|
||||
public static List<NonNullSupplier<? extends Block>> allBlocks() {
|
||||
List<NonNullSupplier<? extends Block>> list = new ArrayList<>();
|
||||
for (TrackMaterial material : ALL.values()) {
|
||||
list.add(material.getTrackBlock());
|
||||
list.add(material.getBlockSupplier());
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
|
@ -105,10 +133,8 @@ public class TrackMaterial {
|
|||
return ANDESITE;
|
||||
|
||||
ResourceLocation id = ResourceLocation.tryParse(serializedName);
|
||||
if (id != null)
|
||||
for (TrackMaterial material : ALL.values())
|
||||
if (material.id.equals(id))
|
||||
return material;
|
||||
if (ALL.containsKey(id))
|
||||
return ALL.get(id);
|
||||
|
||||
Create.LOGGER.error("Failed to locate serialized track material: " + serializedName);
|
||||
return ANDESITE;
|
||||
|
|
@ -116,7 +142,7 @@ public class TrackMaterial {
|
|||
|
||||
public static class TrackType {
|
||||
@FunctionalInterface
|
||||
protected interface TrackBlockFactory {
|
||||
public interface TrackBlockFactory {
|
||||
TrackBlock create(BlockBehaviour.Properties properties, TrackMaterial material);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,13 @@
|
|||
package com.simibubi.create.content.logistics.trains;
|
||||
|
||||
import java.util.function.Supplier;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import com.jozufozu.flywheel.core.PartialModel;
|
||||
import com.simibubi.create.AllTags;
|
||||
import com.simibubi.create.content.logistics.trains.track.TrackBlock;
|
||||
|
||||
import com.tterrag.registrate.util.nullness.NonNullSupplier;
|
||||
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
|
|
@ -13,9 +17,6 @@ import net.minecraftforge.api.distmarker.Dist;
|
|||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import net.minecraftforge.fml.DistExecutor;
|
||||
|
||||
import java.util.function.Supplier;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
public class TrackMaterialFactory {
|
||||
private final ResourceLocation id;
|
||||
private String langName;
|
||||
|
|
@ -25,6 +26,9 @@ public class TrackMaterialFactory {
|
|||
private ResourceLocation particle;
|
||||
private TrackMaterial.TrackType trackType = TrackMaterial.TrackType.STANDARD;
|
||||
|
||||
@Nullable
|
||||
private TrackMaterial.TrackType.TrackBlockFactory customFactory = null;
|
||||
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
private TrackMaterial.TrackModelHolder modelHolder;
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
|
|
@ -113,6 +117,11 @@ public class TrackMaterialFactory {
|
|||
return this;
|
||||
}
|
||||
|
||||
public TrackMaterialFactory customBlockFactory(TrackMaterial.TrackType.TrackBlockFactory factory) {
|
||||
this.customFactory = factory;
|
||||
return this;
|
||||
}
|
||||
|
||||
public TrackMaterial build() {
|
||||
assert trackBlock != null;
|
||||
assert langName != null;
|
||||
|
|
@ -128,6 +137,6 @@ public class TrackMaterialFactory {
|
|||
modelHolder = new TrackMaterial.TrackModelHolder(tieModel, leftSegmentModel, rightSegmentModel);
|
||||
}
|
||||
});
|
||||
return new TrackMaterial(id, langName, trackBlock, particle, sleeperIngredient, railsIngredient, trackType, () -> () -> modelHolder);
|
||||
return new TrackMaterial(id, langName, trackBlock, particle, sleeperIngredient, railsIngredient, trackType, () -> () -> modelHolder, customFactory);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -789,7 +789,7 @@ public class TrackBlock extends Block
|
|||
for (TrackMaterial material : otherTrackAmounts.keySet()) {
|
||||
int amt = otherTrackAmounts.getOrDefault(material, 0);
|
||||
while (amt > 0) {
|
||||
stacks.add(new ItemStack(material.getTrackBlock().get(), Math.min(amt, 64)));
|
||||
stacks.add(material.asStack(Math.min(amt, 64)));
|
||||
amt -= 64;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -522,7 +522,7 @@ public class TrackPlacement {
|
|||
BlockPos offsetPos = pos.offset(offset.x, offset.y, offset.z);
|
||||
BlockState stateAtPos = level.getBlockState(offsetPos);
|
||||
// copy over all shared properties from the shaped state to the correct track material block
|
||||
BlockState toPlace = copyProperties(state, info.trackMaterial.getTrackBlock().get().defaultBlockState());
|
||||
BlockState toPlace = copyProperties(state, info.trackMaterial.getBlock().defaultBlockState());
|
||||
|
||||
boolean canPlace = stateAtPos.getMaterial()
|
||||
.isReplaceable();
|
||||
|
|
@ -545,7 +545,7 @@ public class TrackPlacement {
|
|||
return info;
|
||||
|
||||
if (!simulate) {
|
||||
BlockState onto = info.trackMaterial.getTrackBlock().get().defaultBlockState();
|
||||
BlockState onto = info.trackMaterial.getBlock().defaultBlockState();
|
||||
BlockState stateAtPos = level.getBlockState(targetPos1);
|
||||
level.setBlock(targetPos1, ProperWaterloggedBlock.withWater(level,
|
||||
(AllTags.AllBlockTags.TRACKS.matches(stateAtPos) ? stateAtPos : copyProperties(state1, onto))
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
package com.simibubi.create.foundation.data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.function.BiFunction;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
|
|
@ -13,7 +16,9 @@ import com.tterrag.registrate.builders.BuilderCallback;
|
|||
import com.tterrag.registrate.util.OneTimeEventReceiver;
|
||||
import com.tterrag.registrate.util.nullness.NonNullSupplier;
|
||||
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||
import net.minecraft.world.level.block.entity.BlockEntityType;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.common.util.NonNullPredicate;
|
||||
import net.minecraftforge.fml.DistExecutor;
|
||||
|
|
@ -25,6 +30,9 @@ public class CreateTileEntityBuilder<T extends BlockEntity, P> extends BlockEnti
|
|||
private NonNullSupplier<BiFunction<MaterialManager, T, BlockEntityInstance<? super T>>> instanceFactory;
|
||||
private NonNullPredicate<T> renderNormally;
|
||||
|
||||
private Collection<NonNullSupplier<? extends Collection<NonNullSupplier<? extends Block>>>> deferredValidBlocks =
|
||||
new ArrayList<>();
|
||||
|
||||
public static <T extends BlockEntity, P> BlockEntityBuilder<T, P> create(AbstractRegistrate<?> owner, P parent,
|
||||
String name, BuilderCallback callback, BlockEntityFactory<T> factory) {
|
||||
return new CreateTileEntityBuilder<>(owner, parent, name, callback, factory);
|
||||
|
|
@ -35,15 +43,35 @@ public class CreateTileEntityBuilder<T extends BlockEntity, P> extends BlockEnti
|
|||
super(owner, parent, name, callback, factory);
|
||||
}
|
||||
|
||||
public CreateTileEntityBuilder<T, P> instance(NonNullSupplier<BiFunction<MaterialManager, T, BlockEntityInstance<? super T>>> instanceFactory) {
|
||||
public CreateTileEntityBuilder<T, P> validBlocksDeferred(
|
||||
NonNullSupplier<? extends Collection<NonNullSupplier<? extends Block>>> blocks) {
|
||||
deferredValidBlocks.add(blocks);
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected BlockEntityType<T> createEntry() {
|
||||
deferredValidBlocks.stream()
|
||||
.map(Supplier::get)
|
||||
.flatMap(Collection::stream)
|
||||
.forEach(this::validBlock);
|
||||
return super.createEntry();
|
||||
}
|
||||
|
||||
public CreateTileEntityBuilder<T, P> instance(
|
||||
NonNullSupplier<BiFunction<MaterialManager, T, BlockEntityInstance<? super T>>> instanceFactory) {
|
||||
return instance(instanceFactory, true);
|
||||
}
|
||||
|
||||
public CreateTileEntityBuilder<T, P> instance(NonNullSupplier<BiFunction<MaterialManager, T, BlockEntityInstance<? super T>>> instanceFactory, boolean renderNormally) {
|
||||
public CreateTileEntityBuilder<T, P> instance(
|
||||
NonNullSupplier<BiFunction<MaterialManager, T, BlockEntityInstance<? super T>>> instanceFactory,
|
||||
boolean renderNormally) {
|
||||
return instance(instanceFactory, be -> renderNormally);
|
||||
}
|
||||
|
||||
public CreateTileEntityBuilder<T, P> instance(NonNullSupplier<BiFunction<MaterialManager, T, BlockEntityInstance<? super T>>> instanceFactory, NonNullPredicate<T> renderNormally) {
|
||||
public CreateTileEntityBuilder<T, P> instance(
|
||||
NonNullSupplier<BiFunction<MaterialManager, T, BlockEntityInstance<? super T>>> instanceFactory,
|
||||
NonNullPredicate<T> renderNormally) {
|
||||
if (this.instanceFactory == null) {
|
||||
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> this::registerInstance);
|
||||
}
|
||||
|
|
@ -56,7 +84,8 @@ public class CreateTileEntityBuilder<T extends BlockEntity, P> extends BlockEnti
|
|||
|
||||
protected void registerInstance() {
|
||||
OneTimeEventReceiver.addModListener(FMLClientSetupEvent.class, $ -> {
|
||||
NonNullSupplier<BiFunction<MaterialManager, T, BlockEntityInstance<? super T>>> instanceFactory = this.instanceFactory;
|
||||
NonNullSupplier<BiFunction<MaterialManager, T, BlockEntityInstance<? super T>>> instanceFactory =
|
||||
this.instanceFactory;
|
||||
if (instanceFactory != null) {
|
||||
NonNullPredicate<T> renderNormally = this.renderNormally;
|
||||
InstancedRenderRegistry.configure(getEntry())
|
||||
|
|
|
|||
|
|
@ -21,17 +21,13 @@ import com.simibubi.create.foundation.ponder.content.trains.TrackScenes;
|
|||
import com.simibubi.create.foundation.ponder.content.trains.TrainScenes;
|
||||
import com.simibubi.create.foundation.ponder.content.trains.TrainSignalScenes;
|
||||
import com.simibubi.create.foundation.ponder.content.trains.TrainStationScenes;
|
||||
|
||||
import com.tterrag.registrate.util.entry.BlockEntry;
|
||||
import com.tterrag.registrate.util.entry.ItemProviderEntry;
|
||||
|
||||
import net.minecraft.world.item.DyeColor;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
import net.minecraftforge.registries.RegistryObject;
|
||||
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class PonderIndex {
|
||||
|
||||
static final PonderRegistrationHelper HELPER = new PonderRegistrationHelper(Create.ID);
|
||||
|
|
@ -312,12 +308,14 @@ public class PonderIndex {
|
|||
.addStoryBoard("rose_quartz_lamp", RedstoneScenes2::roseQuartzLamp);
|
||||
|
||||
// Trains
|
||||
HELPER.forComponents(TrackMaterial.allBlocks().stream()
|
||||
.map((trackSupplier) -> new BlockEntry<TrackBlock>(
|
||||
// note: these blocks probably WON'T be in the Create Registrate, but a simple code trace reveals the Entry's registrate isn't used
|
||||
Create.REGISTRATE,
|
||||
RegistryObject.create(trackSupplier.get().getRegistryName(), ForgeRegistries.BLOCKS)))
|
||||
.toList())
|
||||
HELPER.forComponents(TrackMaterial.allBlocks()
|
||||
.stream()
|
||||
.map((trackSupplier) -> new BlockEntry<TrackBlock>(
|
||||
// note: these blocks probably WON'T be in the Create Registrate, but a simple
|
||||
// code trace reveals the Entry's registrate isn't used
|
||||
Create.REGISTRATE, RegistryObject.create(trackSupplier.get()
|
||||
.getRegistryName(), ForgeRegistries.BLOCKS)))
|
||||
.toList())
|
||||
.addStoryBoard("train_track/placement", TrackScenes::placement)
|
||||
.addStoryBoard("train_track/portal", TrackScenes::portal)
|
||||
.addStoryBoard("train_track/chunks", TrackScenes::chunks);
|
||||
|
|
|
|||
Loading…
Reference in a new issue