simibubi
e5c6ca157c
Squashed commit of the following:
...
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
2023-05-09 18:23:47 +02:00
Jozufozu
3d8fdc69de
A little back and forth
...
- Clean up the revert
2022-06-20 09:23:54 -07:00
Jozufozu
fa51b68709
Unbotch the batch
...
- Contraptions now render properly with batching
- Belts can be placed sideways again
2022-06-13 12:31:41 -07:00
simibubi
cfbde0ab6c
Quality of Drive
...
- Mounted Drills no longer attach track blocks
- Train stalling for actors no longer requires it to re-accelerate
- Fixed serverside portal cutoff not properly cleared when exiting a portal slowly
- Fixed mounted fluid tanks not showing contents when on a train
- Non-colliding blocks can no longer be used for auto track pavement
- Changed redstone link range to 256, display link range to 64
- Fixed bearings rotating their top even on contraptions that do not support stabilisation
- Train station crafting recipe now yields 2 blocks instead of 1
- Fixed some train related blocks not being breakable or wrenchable
- Lowered top speed of manually controlled trains by 25%
- Manually controlled trains now slow down to turn top speed when traversing a bezier
- Increased character limit on train names
- Fixed inconsistent deployer facing for oriented contraptions
2022-05-27 15:40:49 +02:00
Jozufozu
d98a07736c
No more diffuse divide
...
- Move PlacementSimulationWorld to Flywheel as VirtualRenderWorld
- Simplify ModelTransformer
- Model doesn't need #configure
- Bump Flywheel build
2021-12-25 15:56:15 -08:00
Jozufozu
748c25b3ec
Better config/backend to account for multiple engines
...
- Rename probably too many things
- Needs to be tested with Optifine
2021-12-22 22:00:27 -08:00
PepperBell
080b048b2f
SmarterTileEntity
...
- Clean up SyncedTileEntity and SmartTileEntity
- Allow schematicannons to be rotated based on placement angle
- Fix DirectionalExtenderScrollOptionSlot rotation
- Remove deprecated usage of JsonReader and LazyLoadedValue
- Move ToolSelectionScreen to content.schematics.client
- Organize imports
- Update to 1.18.1
2021-12-10 16:58:05 -08:00
Jozufozu
ef5afd42c3
Move api package
2021-12-09 15:32:55 -08:00
Jozufozu
1a3f27abc8
Reorganize, rename, refactor, 0.4.0
...
- Move most user facing interfaces to flywheel.api package
- Refactor InstanceData to have no package private classes
- Remove 'I' prefix from many interfaces
- ILightUpdateListener -> LightListener
- IMultiProgram -> ContextAwareProgram
- IFlatLight -> FlatLit
- All materials use the same vertex format: UNLIT_MODEL
2021-12-09 00:44:43 -08:00
PepperBell
0cb7a0260e
Chipping away
2021-11-01 22:18:30 -07:00
simibubi
741fa401d8
Move to official class names
...
- also updated buildscript to 1.17
- some remap corruption from compilation errors in flw/next
2021-11-02 00:08:20 +01:00
Jozufozu
6de4b92ad0
Interfaces and less log lines
...
- MateralManager, MaterialGroup, and InstanceMaterial are all interfaces
- Separate (T)EI facing API from implementation
- Comment out debug log in ModelPool
2021-08-23 22:34:29 -07:00
Jozufozu
a52b6d766f
MaterialGroups and massive refactors
...
- Move material stuff to its own package
- The various render functions in the material tree now bind to specific render layers
- Instancers can choose which layer to use
- The layers are SOLID, CUTOUT, and TRANSPARENT
- More layers are likely unnecessary, but we'll see
- Deprecate functions in MaterialManager in favor of more builderesque ones using MaterialGroups
- Catching up with Flywheel
- Remove MatrixStacker in favor of Flywheel's TransformStack (thread safety too)
2021-07-21 20:30:35 -07:00
grimmauld
a048285699
Bulk remap, compiles
2021-07-15 11:32:03 +02:00
JozsefA
d47f898c76
Move away from a static backend class, add a registration event
2021-06-06 15:46:16 -07:00
JozsefA
bef6d77a59
Start working on instanced enti- oh wait I've got to do all this other stuff first
...
- Separate model-level instance management from object-level instance management
- Separate material management from rendering
- A few things here and there related to entity instancing
- Add a rudimentary command to spawn superglue
2021-06-03 21:23:06 -07:00
PepperBell
61b101f0c6
Refactor contraption matrices
...
- Create ContraptionMatrices class for better management of matrices during the contraption rendering process
- Fix diffuse lighting when rendering contraptions without Flywheel
- Clean up TileEntityRenderHelper
- Add disableDiffuseTransform to SuperByteBuffer and fix light calculation logic
2021-05-16 18:42:56 -07:00
PepperBell
67052fd00c
Add lighting to non-Flywheel contraptions
...
- Pass contraption world to movement behavior rendering
- Add hybrid lighting option to SuperByteBuffer (takes max of world light and vertex light)
- Create ContraptionWorldHolder for caching contraption worlds for contraptions that are not rendered with Flywheel
- Refactor some parts of contraption rendering
2021-05-15 00:21:20 -07:00
JozsefA
55e3f50f64
MaterialSpecs act alone
...
- No more awkward MaterialType/MaterialSpec business
- MaterialTypes are registered directly
- FastRenderDispatcher merged with backend
2021-05-04 21:00:55 -07:00
JozsefA
67e75d747a
Move backend
2021-05-01 16:32:09 -07:00
simibubi
edb1b59f41
Housekeeping
...
- Added an .editorconfig
- Auto-Reformatted most .java files
- Auto-Organized Imports
2021-04-08 19:22:11 +02:00
simibubi
e82f9221b7
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-03-31 15:23:18 +02:00
simibubi
5b63f30df3
Abort Mission
...
- Drills and other block breakers on contraptions now give up trying to destroy a block when their movement direction is reversed
2021-03-31 15:22:41 +02:00
zelophed
d03ea3488a
Merge branch 'mc1.15/dev' into mc1.16/dev
...
# Conflicts:
# src/generated/resources/.cache/cache
# src/generated/resources/assets/create/blockstates/andesite_funnel.json
# src/generated/resources/assets/create/blockstates/brass_funnel.json
# src/generated/resources/assets/create/lang/unfinished/de_de.json
# src/generated/resources/assets/create/lang/unfinished/es_es.json
# src/generated/resources/assets/create/lang/unfinished/fr_fr.json
# src/generated/resources/assets/create/lang/unfinished/it_it.json
# src/generated/resources/assets/create/lang/unfinished/ja_jp.json
# src/generated/resources/assets/create/lang/unfinished/ko_kr.json
# src/generated/resources/assets/create/lang/unfinished/nl_nl.json
# src/generated/resources/assets/create/lang/unfinished/pt_br.json
# src/main/java/com/simibubi/create/AllBlocks.java
# src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java
# src/main/java/com/simibubi/create/content/contraptions/components/actors/ContraptionActorData.java
# src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterRenderer.java
# src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterTileEntity.java
# src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerRenderer.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntity.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AssemblyException.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/IDisplayAssemblyExceptions.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovementBehaviour.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntity.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/LinearChassisBlock.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageBlock.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlock.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java
# src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutTileEntity.java
# src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankTileEntity.java
# src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveGoggleInformation.java
# src/main/java/com/simibubi/create/content/contraptions/particle/RotationIndicatorParticle.java
# src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltMovementHandler.java
# src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItem.java
# src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelFilterSlotPositioning.java
# src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelMovementBehaviour.java
# src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelTileEntity.java
# src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/AbstractFilterScreen.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterScreen.java
# src/main/java/com/simibubi/create/content/schematics/SchematicWorld.java
# src/main/java/com/simibubi/create/content/schematics/block/SchematicTableScreen.java
# src/main/java/com/simibubi/create/content/schematics/block/SchematicannonRenderer.java
# src/main/java/com/simibubi/create/events/ClientEvents.java
# src/main/java/com/simibubi/create/foundation/block/connected/ConnectedTextureBehaviour.java
# src/main/java/com/simibubi/create/foundation/collision/CollisionDebugger.java
# src/main/java/com/simibubi/create/foundation/collision/OBBCollider.java
# src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java
# src/main/java/com/simibubi/create/foundation/gui/AbstractSimiContainerScreen.java
# src/main/java/com/simibubi/create/foundation/gui/AbstractSimiScreen.java
# src/main/java/com/simibubi/create/foundation/gui/AllGuiTextures.java
# src/main/java/com/simibubi/create/foundation/gui/AllIcons.java
# src/main/java/com/simibubi/create/foundation/gui/widgets/SelectionScrollInput.java
# src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java
# src/main/java/com/simibubi/create/foundation/mixin/LightUpdateMixin.java
# src/main/java/com/simibubi/create/foundation/mixin/RenderHooksMixin.java
# src/main/java/com/simibubi/create/foundation/render/KineticRenderer.java
# src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java
# src/main/java/com/simibubi/create/foundation/render/backend/Backend.java
# src/main/java/com/simibubi/create/foundation/render/backend/instancing/InstancedTileRenderer.java
# src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java
# src/main/java/com/simibubi/create/foundation/utility/ColorHelper.java
# src/main/java/com/simibubi/create/foundation/utility/Lang.java
# src/main/java/com/simibubi/create/foundation/utility/MatrixStacker.java
# src/main/java/com/simibubi/create/foundation/utility/TreeCutter.java
# src/main/java/com/simibubi/create/foundation/utility/VecHelper.java
# src/main/java/com/simibubi/create/foundation/utility/placement/IPlacementHelper.java
# src/main/java/com/simibubi/create/foundation/utility/placement/util/PoleHelper.java
2021-03-20 12:58:02 +01:00
JozsefA
018c177f1e
Better contraption actor instancing.
...
- Promoted actor instance creation to the ActorInstance class.
- Drills and Harvesters' rotational speed is based on their movement speed with Flywheel on.
- Deployers now use Flywheel.
2021-03-16 15:52:37 -07:00
simibubi
4ee9dd8a8a
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-02-19 00:49:39 +01:00
simibubi
d59fea1079
Bloat.
...
- Auto-Organize inputs
- runData after lang PRs
- change runWhenOn to non-deprecated unsafeRunWhenOn, now that late forge version is required
- Address a few warnings
2021-02-18 19:43:22 +01:00
JozsefA
31a1fd71ce
everything is somewhere else
2021-02-11 23:36:05 -08:00
JozsefA
0cb9094913
non experimental contraption rendering is back.
...
schematic rendering is fixed.
both of these are kinda ugly hacks, and there is definitely some rewriting necessary for when it's time to be more opengl compatible.
maybe fix belt lighting, again.
remove old belt assets.
2021-02-09 16:14:44 -08:00
JozsefA
5ba4477ada
restore old tile rendering from 3336778052
2021-02-06 02:26:56 -08:00
JozsefA
dea3f05364
fix saws not rendering their shafts in contraptions
2021-01-23 16:39:11 -08:00
JozsefA
cfd60fbc8d
fast actor rendering but it's not correct yet
2021-01-22 18:00:14 -08:00
JozsefA
f6518d5c5d
insane amounts of refactoring
...
surprisingly it all still works the same, but better
maybe still some more cleanup to do
2021-01-22 11:28:39 -08:00
tterrag
c1f68ab830
Prospective 1.16 port start - only find/replace fixes so far
2020-07-22 22:16:11 -04:00
simibubi
f9fc00855a
Reversed Simi's reverse-rendering
...
- Fixed all TERs that had their transformations backwards
- Fixed contraptions not rendering tileentities when not near world origin
- Fixed Schematic table crashing on upload
- Made more kinetic blocks non-opaque
2020-05-25 23:09:36 +02:00
simibubi
4e8a72be8b
Moving contraptions in 1.15
...
- Ported the contraption renderer
- Fixed sticky blockstates of the linear chassis
- SuperByteBuffers can now be given a separate matrixStack for vertex lighting
- Kinetic TERs now make use of the passed light parameter
2020-05-25 19:58:13 +02:00
simibubi
78ad674c22
Re-organized packages and utilities
2020-05-23 14:02:38 +02:00