mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-28 16:06:48 +01:00
Code Issues Projects Releases Packages Wiki Activity
2599 commits 31 branches 14 tags 107 MiB
Commit graph

2599 commits

This branch
This branch
All branches
Author SHA1 Message Date
MRH0
2f35b76f1a Update FurnaceEngineModifiers.java 2021-12-31 16:34:48 +01:00
MRH0
6107b939a5 cleanup 2021-12-31 16:29:22 +01:00
MRH0
8145014847 Disconnecting the Furnace Engine from AbstractFurnaceBlock 
Adds the abillity to register any block as a power source to the furnace engine. This will allow for more flexability and remove the need to implement AbstractFurnaceBlock and AbstractFurnaceBlockEntity.
 2021-12-31 03:17:56 +01:00
Jozufozu
1bae455045
Merge pull request #2525 from The-Vowels/mc1.18/dev 
Fix a gantry carriage crash with Starlight 🙃
 2021-12-30 14:08:30 -08:00
Aeiou
345b83ee90 Improve comment clarity on height-related methods in ContraptionWorld and WrappedWorld 2021-12-30 15:32:55 -05:00
Aeiou
a12708b336 big brain fix c: 2021-12-30 13:51:48 -05:00
Jozufozu
77efe8750b Add 0.4.0b to bug report yml 2021-12-29 18:49:19 -08:00
simibubi
3deb23303d Moss, Paper, Scissors 
- Dripstone and Lush Caves can now replace exposed create stone types with their own generated blocks
 2021-12-28 13:48:30 +01:00
simibubi
8e4dcb958d Stonehedge 
- Fixed Harvesters hard-colliding with leaves when used with pistons, pulleys or a gantry carriage
- Fixed kinetic tiles not marking chunks for saving when speed or stress changes
- Dedicated Servers no longer create a resourcepack folder
 2021-12-28 13:04:22 +01:00
Jozufozu
ffeecfdce0 Go through GlVertexArray 
- VAO state is now handled by GlVertexArray objects
 - IndexedModel no longer inherits from VBOModel
 - BufferedModel doesn't need #clearState
 - Likely fixes crash on intel drivers
 2021-12-27 19:16:06 -08:00
Jozufozu
150158d7be Merge branch 'The-Vowels/mc1.18/dev' into mc1.18/dev 
# Conflicts:
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java
#	src/main/java/com/simibubi/create/foundation/utility/worldWrappers/PlacementSimulationWorld.java
#	src/main/java/com/simibubi/create/foundation/utility/worldWrappers/chunk/WrappedChunk.java
 2021-12-26 15:43:55 -08: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
Aeiou
658f5125e0 Merge remote-tracking branch 'upstream/mc1.18/dev' into mc1.18/dev 
# Conflicts:
#	src/main/java/com/simibubi/create/foundation/utility/worldWrappers/PlacementSimulationWorld.java
 2021-12-24 21:41:27 -05:00
Jozufozu
714b926ee3 Bump Flywheel build - 0.5.0.28 2021-12-24 16:35:53 -08:00
Jozufozu
896a89852e Merge branch 'mc1.18/dev' into mc1.18/flwbatching 2021-12-23 23:23:12 -08:00
Jozufozu
0a4311b51e Contraptions and engines 
- Sort of get the batching engine working for contraptions but this feels wrong
 - TaskEngine gets passed in methods
 - Better naming for TaskEngines
 - Do BufferSource ourselves
 - Change BufferBuilderMixin to allow for injection into BufferBuilder objects
 2021-12-23 23:22:53 -08:00
Jozufozu
ac3c9aa3bb Switch back to parchment, update forge 2021-12-23 23:09:51 -08:00
Jozufozu
3cb84a5db5 Merge branch 'mc1.18/flwbatching' into mc1.18/dev 2021-12-22 22:06:07 -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
reidbhuntley
5d435e1da7 Merge remote-tracking branch 'origin/mc1.17/dev' into mc1.18/dev 2021-12-22 22:19:17 -05:00
reidbhuntley
13b2e6dd6b Fix Toolbox moving items into player armor slots 2021-12-22 22:13:38 -05:00
reidbhuntley
7791d340e1 Add null check to chutes 2021-12-22 21:30:30 -05:00
reidbhuntley
bf59956f23 Fix summoned Crafting Blueprint entities corrupting the world 2021-12-22 21:14:02 -05:00
reidbhuntley
fa22830b04 Fix cart contraptions turning the wrong way on fast, tight turns 2021-12-22 20:13:48 -05:00
reidbhuntley
14d15089db
Merge pull request #2384 from dithpri/smart-chute-fix 
Fix powered smart chutes outputting items
 2021-12-22 13:32:12 -05:00
reidbhuntley
e41825d5bf Replace Quark Cactus Paste crushing recipe with Moss Paste 2021-12-22 13:18:23 -05:00
reidbhuntley
bc2ced472e
Merge pull request #2462 from noolaan/patch-1 
Delete quark biotite compatibility recipe
 2021-12-22 13:12:43 -05:00
Jozufozu
97490e51ca Finally safe vertex formats 
- true to false for Pepper
 - IBufferedModel -> BufferedModel
 - VertexFormat -> BufferLayout
 - Use ImmutableList in BufferLayout
 - LayoutItem naming consistency
 - Try to reduce usage of raw BufferLayouts
 - Move vertex interfaces to api package
 - #createWriter and #createReader in VertexType
 - Some documentation
 2021-12-22 02:45:46 -08:00
Jozufozu
b8034b4b2e util and core cleanup 
- Consolidate/audit utility classes
 - Move more towards sane vertex types
 2021-12-22 00:22:43 -08:00
Jozufozu
aa96a28f0b Make the BatchingEngine not jittery 
- Stop having threads compete for a single BufferBuilder
 - ...by skirting around minecraft's BufferSource
 - Begin work on making vertex writing sane
 2021-12-21 22:47:30 -08:00
reidbhuntley
9897666249 Merge remote-tracking branch 'origin/mc1.18/dev' into mc1.18/dev 2021-12-21 17:08:20 -05:00
Aeiou
eafce50904
Merge branch 'Creators-of-Create:mc1.18/dev' into mc1.18/dev 2021-12-21 16:48:44 -05:00
PepperCode1
7942b570f0 Brackets, models, and reload listeners 
- Fix bracket contraption rotation; Fix #1856
- Make sure KineticTileEntityRenderer only renders once
- Make use of new ModelUtil method in BakedModelRenderHelper
- Clear up BracketedKineticBlockModel and PipeAttachmentModel logic
- Replace ISimpleReloadListener usage with ResourceManagerReloadListener
 2021-12-21 13:44:00 -08:00
reidbhuntley
75d4295118 Merge remote-tracking branch 'origin/mc1.17/dev' into mc1.18/dev 
# Conflicts:
#	src/main/java/com/simibubi/create/foundation/tileEntity/SmartTileEntity.java
 2021-12-21 16:40:14 -05:00
reidbhuntley
10f84bcd79 Temporary fix for Forge 1.17 setRemoved() regression 2021-12-21 16:28:14 -05:00
reidbhuntley
a61739eb1e Merge remote-tracking branch 'origin/mc1.18/dev' into mc1.18/dev 2021-12-21 12:23:12 -05:00
reidbhuntley
0a9c10a13d Fix Schematicannon rail placement crash 2021-12-21 12:22:49 -05:00
Jozufozu
5f46560fb2 StructType doesn't need #asBatched and #asInstanced 
- More organized this way
 - BatchingTransformer function moved into Batched
 2021-12-20 22:38:34 -08:00
Jozufozu
848eb904f5 Fluid#isSame is asymmetric 
- Fixes #2490
 2021-12-20 21:51:49 -08:00
reidbhuntley
bcfd0aed88
Exempt critical issues from being marked as stale 2021-12-20 20:44:21 -05:00
reidbhuntley
b9310e93a9 Add mineable-with-pickaxe tag to new palette partial blocks 2021-12-20 19:50:17 -05:00
Aeiou
5015412043 Merge remote-tracking branch 'origin/mc1.18/dev' into mc1.18/dev 
# Conflicts:
#	build.gradle
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionWorld.java
#	src/main/java/com/simibubi/create/foundation/utility/worldWrappers/PlacementSimulationWorld.java
 2021-12-20 17:03:06 -05:00
Aeiou
e6c99b250e Add more LevelHeightAccessor Overrides to WrappedWorld to avoid logical conflicts with other mods which may make changes to the default vanilla implementations of these methods. In particular, Create Refabricated would conflict with Lithium if Starlight was installed. These changes prevent such an issue from occurring if a Forge mod were to attempt a similar optimization to Lithium's, where Level heights are assumed to behave in predictable, static ways 2021-12-20 16:56:28 -05:00
Aeiou
5e09cc3de2 Use implementation instead of compileOnly for starlight in build.gradle 2021-12-20 16:56:27 -05:00
Aeiou
7fd531199c Add Starlight to Mods enum, along with an executeIfInstalled method. Use said method in WrappedChunk in place of an if-statement to execute Starlight-dependent code 2021-12-20 16:56:27 -05:00
Aeiou
11e6c3f45a Change from jetbrains @NotNull to javax @Nonnull annotation in PlacementSimulationWorld 2021-12-20 16:56:27 -05:00
Aeiou
6938bc2e06 Implement Starlight compatibility. 2021-12-20 16:56:27 -05:00
Aeiou
af6ad4b70b
Merge branch 'Creators-of-Create:mc1.18/dev' into mc1.18/dev 2021-12-19 19:08:22 -05:00
Aeiou
3415ba97ac Add Starlight to Mods enum, along with an executeIfInstalled method. Use said method in WrappedChunk in place of an if-statement to execute Starlight-dependent code 2021-12-19 18:43:38 -05:00
Aeiou
56fd2e0a63 Change from jetbrains @NotNull to javax @Nonnull annotation in PlacementSimulationWorld 2021-12-19 17:17:17 -05:00