mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-16 07:24:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,807 Commits 31 Branches 14 Tags 106 MiB
79977aee14
Commit Graph

1458 Commits

Author SHA1 Message Date
simibubi
1a315a11cf Merge branch 'mc1.15/ponder-ui' into mc1.15/dev 2021-03-08 17:29:06 +01:00
JozsefA
b31f4d09bd Housekeeping. 2021-03-08 02:27:56 -08:00
JozsefA
8ce0f47f01 No more 7 circles of callbacks. 
- Instead of using consumers to edit instance data, just give the user a pointer to the data.
 - Easier to use, more predictable access.
 2021-03-08 02:02:47 -08:00
JozsefA
d0e5be24d7 Transformed models. 2021-03-08 00:36:23 -08:00
simibubi
ca2cf94579 Scene hacking getting out of control 
- New highly over-engineered scenes for Encased Fans
- Potential Fix for GL errors with the framebuffer system
 2021-03-08 02:59:43 +01:00
simibubi
15e88b9bcf Belts 
- Ponder scenes for the belt
 2021-03-07 21:52:11 +01:00
simibubi
47b54b1ae6 Ponder me this 
- auto-backtracking is now more generic and works for tag screens
- Ponder entries for water wheel, motor, hand crank and valves
 2021-03-07 17:22:18 +01:00
JozsefA
bb3fed2a3b Towards better normals. 
- Easier SuperByteBuffer transform settings.
 - Some cleanup here and there.
 2021-03-06 21:46:17 -08:00
JozsefA
e930e62436 Belting these bugs. 
- Belts now always render their items again.
 - Items on belts on contraptions are now at least somewhat lit.
 2021-03-06 15:08:46 -08:00
JozsefA
25b4e4d5be The bell tolls for this bug. 
- Fix MovementBehavior#onSpeedChanged not ever being called.
 2021-03-06 14:33:01 -08:00
simibubi
3bc2a9e30f Sanity for translators 
- Generated lang entries of re-used scenes now refer to the same set of keys
- Scenes for Chain Drive and Chain Gearshift
 2021-03-06 18:08:03 +01:00
simibubi
aa0a58b0da Tooltips except it takes one hour per block 
- Added and assigned more ponder tags
- Ponder Scenes for cog, large cog, gearbox, clutch, gearshift, and casings
- Fixed TE model data not queried on schematics and ponder scenes
 2021-03-06 04:06:49 +01:00
simibubi
83a641c3b8 go teach them 
- Ponder scenes for portable storage interface
- More work on tags
- Fixed tag screen on small resolution
 2021-03-05 20:54:41 +01:00
JozsefA
25fdf08e11 Fog modes for new rendering. 
- For each fog mode, compile a different version of each shader.
 - Could maybe do some fancier preprocessing to make writing shaders easier?
 2021-03-04 23:43:28 -08:00
simibubi
e2c50663a5 UI and tag enhancements 
- Fixed partial ticks on transitions
- Transitions center on clicked components
- Added auto-lang for tags
- Moved some other ui stuff around
 2021-03-05 01:36:41 +01:00
MRH0
40fef0eaf9 Update KineticTileEntity.java 2021-03-05 00:50:51 +01:00
JozsefA
b511a20814 Flappy packets. 
- Instead of sending the entire tile entity (and maybe even chunk), send just what we need to.
 - Avoids unnecessary chunk rebuilds when flaps flap.
 - Beginning of a larger process to replace calls to SyncedTileEntity#sendData
 2021-03-04 15:34:17 -08:00
zelophed
d590b23aa7 tagging along 
- added tags and chapters to the ponder registry
- slightly changed how scenes are registered
- added a back stack to the screen opener and some animations to go along with it
- added a interface for icons drawn into screens
 2021-03-04 12:58:26 +01:00
JozsefA
9062f1c8fa Null checks and flap updates. 2021-03-03 17:15:45 -08:00
JozsefA
fe492c5d75 Better instance deletions. 
- Defer element removal until just before the model is drawn.
 - Use a modified version of ArrayList#removeIf to delete the instances and adjust the keys.
 2021-03-03 17:14:19 -08:00
JozsefA
9d77f85b94 Fix crash on world reload. 2021-03-03 13:10:44 -08:00
grimmauld
93973004c8 Seats don't Like deployers. They just don't. 2021-03-03 19:33:15 +01:00
simibubi
8bf82aff79 Refactor Goggles Fluid Information 
- Removed code duplicates
- Made fluid information more generic and concise
- Made fluid information easier to port
- Fixed potion fluid not overriding its translation key
- (I'm sorry, Steven)
 2021-03-03 19:17:56 +01:00
simibubi
31cb704894 Refactor comparator overrides 
- Removed unnecessary level tracking
- Remove code duplicates
- Fixed smart fluid tank behaviours not triggering markDirty on deferred fluid update
 2021-03-03 17:59:27 +01:00
simibubi
562104341d
Merge branch 'mc1.15/dev' into comparator-tanks 2021-03-03 16:30:59 +01:00
simibubi
325ca68917
Merge pull request #1138 from SuicidalSteve/mc1.15/dev 
[Bugfix] Make omnidirectional entity crushing more consistent.
 2021-03-03 16:23:46 +01:00
JozsefA
b1dc36d358 Trying to tick everything is slow. 
- Keep track of tickable instances separately.
 2021-03-03 02:37:04 -08:00
simibubi
c1c6e5e046 Controlled attachment 
- Added the Sticker, a redstone-driven block attachment component
- Fixed lighting of TileEntities lowered by a pulley
 2021-03-03 05:21:58 +01:00
simibubi
5949dd376b Fixed honey bottles on belt/depots 2021-03-03 02:34:57 +01:00
simibubi
e87849deca Vector's food expansion 
- Added honeyed apples
- Added sweet rolls
- Added chocolate glazed berries
- New goggles item model
- Other texture tweaks
 2021-03-03 02:30:21 +01:00
JozsefA
5499fdbad0 The flappening. 
Tunnel and funnel flaps are now rendered with the new engine.
 2021-03-02 15:54:31 -08:00
simibubi
2e1129a3a5 Thinking about Gantries 
- Added Ponder entries for gantry shafts and carriages
- Added ability to mark lang key prefixes as ignored, leaving out 'dev-only' lang entries from the localization templates
- Gantry Pinion -> Gantry Carriage
- Scenes can now be "re-assembled" by their storyboard while Ponder is opened using shift+refresh
- removed the requirement of editor provided lang keys for text windows
- couple fixes, changes to instructions
 2021-03-02 05:53:43 +01:00
grimmauld
1e28bc998a Make contraptions not take that stupid amount of cpu time when in water 2021-03-01 10:37:49 +01:00
simibubi
0a1be94cbb Funnel Fantasy VII 
- Finished ponder entries about funnels
- Smart TEs can now enter "virtual mode" to run both client and server code (support for it needs individual adjustment)
- Removed obsolete quads from the andesite funnels' model
- Not enough ponder instructions
- Fixed upright belt items in ponder UI
 2021-02-28 23:49:51 +01:00
JozsefA
55f1b538b5 Only contraptions use EBOs now. 
Tight light bounds for bearing contraptions.
 2021-02-27 21:35:45 -08:00
JozsefA
884f19d518 Fix issue when rendering very large contraptions. 2021-02-27 18:29:35 -08:00
JozsefA
3a2771c5c0 Fix issue restricting the maximum size of contraptions. 2021-02-27 18:24:48 -08:00
simibubi
43f0ad1c78 Freeze and Identify 
- Ponder scenes can now be paused and analysed, viewing tooltips for targeted blocks in the scene
- During editing, identify mode can be used to move targeted positions to the clipboard
- Ponder-compatible components can be pondered about in identify mode
 2021-02-28 01:34:56 +01:00
_0Steven
8e5b5582f3 Fluid Overlays and Comparator Compat 
-Add comparator compat to fluid tanks, spouts, and item drains.
-Add goggle overlays to fluid tanks, spouts, item drains, and basins.
-Update goggle item tooltip slightly.
 2021-02-27 17:08:35 +01:00
simibubi
692c6deaaf More pondering 
- First couple of funnel scenes
- More utility methods
- Scene progress bar
- An inspect mode that does nothing
 2021-02-26 19:46:56 +01:00
JozsefA
6dc4a18ed3 Extra safety checks. 2021-02-25 17:16:22 -08:00
zelophed
e1644c11e2 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-02-25 19:03:23 +01:00
zelophed
46bbdc70c9 small command adjustments 2021-02-25 19:03:07 +01:00
JozsefA
c030c08c86 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev 2021-02-24 16:53:45 -08:00
JozsefA
e62d89b21c Everything is lit, hopefully all the time now. 2021-02-24 16:52:49 -08:00
zelophed
753d5d2fa9 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-02-24 22:06:51 +01:00
zelophed
2f12326203 cloning glue 2021-02-24 22:06:40 +01:00
simibubi
550744da92 Merge branch 'mc1.15/dev' into mc1.15/ponder-ui 2021-02-24 17:52:20 +01:00
simibubi
051a32557f Desperate Control 
- Belt items and item entities now support element links (albeit in a slightly limited fashion)
 2021-02-24 17:48:45 +01:00
JozsefA
cad71e5843 Even more compatibility. 2021-02-23 16:20:46 -08:00
JozsefA
f525b7e913 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev 2021-02-22 11:27:12 -08:00
JozsefA
bac4be1728 Superglue no longer gums up spawn packets 2021-02-22 11:25:38 -08:00
zelophed
da09112e3c Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-02-22 03:20:54 +01:00
zelophed
5da1a64622 utility commands 2021-02-22 03:20:09 +01:00
simibubi
fe1c32de05 Cheese control 
- Windmill bearings now have a configurable minimum of sail blocks
 2021-02-21 23:01:57 +01:00
simibubi
e3915792b1 Back to Directional 
- New vertical funnel models by @Kryppers
 2021-02-21 22:29:46 +01:00
simibubi
9d4e52092e Basic item simulation 
- Support for generic entities inside ponder scenes
- Instructions for manipulating/creating entities
- Client-side belts are now slightly smarter inside a ponder world
- Some doc for the doc
 2021-02-21 19:29:23 +01:00
zelophed
46daa3f699 composting, but fancy 
- add the composter as a mechanical arm interaction point
 2021-02-21 18:12:19 +01:00
simibubi
c4e1f680c9 Such convenience 
- Organized util and scene builder methods into nested classes
- Selection rework, allows for addition and substraction
- World sections now merge into a global world section after fading in
- Support for managing reference to elements created by previous instructions
- more util
- Support for animating world sections to roughly simulate a contraption
- Less paperwork for making new scenes
- Support for outliner chaseAABB
- Support for outlining selections
 2021-02-21 03:18:04 +01:00
JozsefA
b5f9cbc4b3 improve compatibility layer. 2021-02-20 15:22:07 -08:00
_0Steven
41cb2ad937 Stop explody crusher drops 
- Remove the velocity of item entities dropped by crushed mobs so they fall neatly onto belts rather than exploding everywhere.
 2021-02-20 18:50:40 +01:00
grimmauld
77d5c00949 merge cleanup 2021-02-20 18:00:16 +01:00
grimmauld
f6b9d71169 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-02-20 17:58:25 +01:00
grimmauld
6542f2f087 Some cleanup 2021-02-20 17:58:16 +01:00
grimmauld
31e3c5b0bd Port recent changes 2021-02-20 17:27:51 +01:00
_0Steven
a32cbe15a3 Consistently Crushing Entities 
- Fix known issue with omnidirectional crushing wheels inconsistently moving crushed mob drops to the output location.
 2021-02-20 15:08:58 +01:00
JozsefA
e84c6d3abe tweak max origin distance to avoid z-fighting at relatively high coordinates. 
remove unnecessary state changes.
 2021-02-19 15:00:28 -08:00
simibubi
45fc0ca7ee post-merge fixup 2021-02-19 20:21:29 +01:00
simibubi
b61dc0d562 Merge branch 'mc1.15/dev' into mc1.15/ponder-ui 2021-02-19 18:03:34 +01:00
simibubi
afe2c4497d Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2021-02-19 16:59:59 +01:00
simibubi
bfd666bb9c Sequenced Adjustments 
- Added more descriptive names for sequencer instructions
- 'Await' instruction now requires a rising flank to trigger
- Fixed invalid json of german localization
- Ingored crushing wheel controllers facing in blockstate datagen
 2021-02-19 16:55:45 +01:00
grimmauld
a3f2fbe788 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-02-19 16:39:11 +01:00
grimmauld
5b65a5d78b better fan stream advancement trigger 2021-02-19 16:39:01 +01:00
simibubi
2ece21a3ec
Merge pull request #962 from CookieNick/mc1.15/paused-sequenced-gearshift 
Added the 'Paused' instruction for sequenced gearshift
 2021-02-19 15:10:14 +01:00
grimmauld
d0357df863 Move stuff of RegistryTrigger over to StringSerializableTrigger to make future expansion possible 2021-02-19 15:08:50 +01:00
simibubi
13e8f67d05
Merge pull request #900 from SuicidalSteve/mc1.15/dev 
Omnidirectional Crushing Wheels
 2021-02-19 15:01:19 +01:00
grimmauld
589572df6c kill kinetic block trigger, clean up unused stuff 2021-02-19 14:49:22 +01:00
simibubi
37434f3933
Merge pull request #1045 from TheBv/mc1.15/dev 
Fixed issues with the blockzapper and FTBChunks
 2021-02-19 14:46:48 +01:00
simibubi
fd65acd91d
Merge pull request #1062 from Snownee/mc1.15/dev 
Bug fixes
 2021-02-19 14:22:37 +01:00
grimmauld
667c213506 remove unused light absorb trigger 2021-02-19 14:13:18 +01:00
grimmauld
3f9ee09953 Rework Bracket trigger to now be a registry trigger based on base block 2021-02-19 14:12:26 +01:00
grimmauld
d9aa912796 generic registry based triggers (replaced kinetic block trigger and infinite fluid trigger) 2021-02-19 09:09:29 +01:00
simibubi
355a1dd95d Port new changes 2021-02-19 00:50:05 +01:00
simibubi
4ee9dd8a8a Merge branch 'mc1.15/dev' into mc1.16/dev 2021-02-19 00:49:39 +01:00
JozsefA
84c9569707 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/experimental-rendering 2021-02-18 14:10:43 -08:00
JozsefA
3e63afa5f5 fix concurrent modification 2021-02-18 14:00:17 -08:00
grimmauld
7023148e7f generic infinite fluid triggers 2021-02-18 23:00:17 +01:00
grimmauld
8c8a9abd8a Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 
# Conflicts:
#	src/generated/resources/assets/create/blockstates/fluid_pipe.json
 2021-02-18 22:32:45 +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
simibubi
cf34b2e96b Fix fast fluid valves 
- Ensure animated indicators on fluid valves still show up with experimental rendering
 2021-02-18 18:05:39 +01:00
simibubi
203ca6f849 Birbs and Click input 2021-02-18 15:44:18 +01:00
JozsefA
9b4d53d452 fix one residual merge conflict. 
creating matrix stacks is expensive, but correct.
 2021-02-17 14:27:49 -08:00
JozsefA
24ab4e181f Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/experimental-rendering 
# Conflicts:
#	src/main/java/com/simibubi/create/CreateClient.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
#	src/main/java/com/simibubi/create/events/ClientEvents.java
#	src/main/resources/META-INF/accesstransformer.cfg
 2021-02-17 14:06:13 -08:00
JozsefA
02db3f5a2c fix some problematic code. 
creating matrix stacks is expensive, apparently
 2021-02-17 13:58:24 -08:00
JozsefA
a5d6262424 fix mechanical crafter cogs 2021-02-17 11:24:40 -08:00
Zelophed
159e298e8b paletted contraptions 
- use minecraft's palette-map during serialization and deserialization to reduce compound size in most cases
- also update the placement_indicator sprite sheet
 2021-02-17 17:21:31 +01:00
JozsefA
7aa175dd9c fix gantry cogs skipping every half rotation 2021-02-16 15:13:48 -08:00
JozsefA
d2e30eeab5 finish merge 
remove old assets
 2021-02-16 14:47:03 -08:00
Zelophed
bec13b8e7d Assisted Placement, Part IV-b 2021-02-16 22:50:11 +01:00
grimmauld
716f79872c Actually port 2021-02-16 20:52:26 +01:00
grimmauld
c6f82bff5e Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-02-16 20:29:40 +01:00
grimmauld
08562d2689 preliminary merge 2021-02-16 20:21:42 +01:00
simibubi
fd99acc00a Merge branch 'mc1.15/dev' into mc1.15/ponder-ui 2021-02-16 19:36:12 +01:00
simibubi
18067e8d5c Ponder 
- rebrand
- support for particles
- support for fluids
- support for outliner
- coloured text labels
- debug scenes
- proper UI stuff
- proper layered rendering
 2021-02-16 19:35:26 +01:00
JozsefA
15302495f5 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/experimental-rendering-merge 
# Conflicts:
#	src/main/java/com/simibubi/create/AllEntityTypes.java
#	src/main/java/com/simibubi/create/AllSpriteShifts.java
#	src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntityRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntity.java
#	src/main/java/com/simibubi/create/foundation/command/AllCommands.java
#	src/main/java/com/simibubi/create/foundation/utility/outliner/Outliner.java
 2021-02-15 21:27:08 -08:00
Zelophed
b9d1a586c1 Assisted Placement, Part IV 
- added 👻-blocks as a placement preview
 2021-02-16 00:48:13 +01:00
JozsefA
1e95fe4c7b avoid floating point accuracy errors at high coordinate values. 
refactor contraption model translation to be a method in AbstractContraptionEntity.
 - this simplifies the setup required for the fast rendering.
 2021-02-14 23:09:17 -08:00
Snownee
5e14ca71d9 Add max stack size check to ItemHelper.extract 2021-02-14 11:51:31 +08:00
Snownee
676a05ad07 Fix rose quartz duplication glitch (#1104) 2021-02-14 11:18:38 +08:00
JozsefA
11616a0b16 avoid 'glGet's at all costs 2021-02-13 16:26:34 -08:00
JozsefA
951a0c4769 contraption actors take into account self lighting 2021-02-13 13:10:14 -08:00
JozsefA
0ad6db4bf7 cache KTEs' renderBoundingBox 2021-02-12 23:06:41 -08:00
Snownee
2d2c7e653f Avoid unnecessary piston contraption assembling 2021-02-13 14:14:28 +08:00
JozsefA
b1905ddfd4 probably fix issue with phosphor crashing contraptions 2021-02-12 21:11:35 -08:00
Snownee
dae651c046 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2021-02-13 13:06:11 +08:00
JozsefA
e88dd89262 whoops null pointer is no more 2021-02-12 19:33:13 -08:00
JozsefA
485a0d2f95 hotswapping is more sane now. 2021-02-12 17:30:21 -08:00
JozsefA
a5f3d799d1 kinda separate system capability stuff, should probably clean this up more. 
fix lighting glitches on world load.
 2021-02-12 16:36:20 -08:00
simibubi
8ab27904db More Instructions 2021-02-12 17:08:48 +01:00
JozsefA
d824304f12 tile entities on contraptions account for self lighting 2021-02-12 00:13:39 -08:00
JozsefA
a8053ce472 these are somewhere else too 2021-02-11 23:41:52 -08:00
JozsefA
31a1fd71ce everything is somewhere else 2021-02-11 23:36:05 -08:00
JozsefA
67408e0dff better vertex attributes. 
all shaders are now GL 2.0 compatible!!!
contraption structure rendering is technically 2.0 compatible now, need some better handling for that.
 2021-02-11 20:03:24 -08:00
Zelophed
34de9a0319 Player Feedback, Part III 2021-02-12 03:13:19 +01:00
JozsefA
576165e3d6 some attrib stuff 2021-02-11 14:31:50 -08:00
Zelophed
82e922032a Merge branch 'mc1.15/feedback2' into mc1.15/dev 
# Conflicts:
#	src/generated/resources/.cache/cache
#	src/generated/resources/assets/create/lang/unfinished/de_de.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/generated/resources/assets/create/lang/unfinished/ru_ru.json
#	src/generated/resources/assets/create/lang/unfinished/zh_cn.json
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/StabilizedContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyContraption.java
 2021-02-11 20:07:38 +01:00
Zelophed
b4c881a6c8 Player Feedback, Part II 2021-02-11 17:47:55 +01:00
JozsefA
3820e11954 get it working again 2021-02-11 02:26:30 -08:00
JozsefA
02114b1d9a begin 2.0 compatibility push, probably not going to be ready for the next release 2021-02-10 17:14:03 -08:00
Zelophed
f3fd32edd3 Assisted Placement, Part III 
- blocks placed by helpers make sounds again
- helpers now trigger the proper event and can be cancelled
 2021-02-11 00:28:47 +01:00
simibubi
fd3d7bd7fd Refined animations, key input 2021-02-10 16:40:30 +01:00
JozsefA
e93562569b world fog works, fluid fog still doesn't. 
better dimension changes.
 2021-02-09 21:18:05 -08:00
simibubi
e178cab4a8 Multiple scenes per doc 2021-02-10 03:13:33 +01: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
simibubi
6836bd97f4 First Steps 2021-02-09 22:34:14 +01:00
JozsefA
6736577e1b fix the rainbow debugger 2021-02-08 21:38:45 -08:00
JozsefA
cfff806df4 some micro optimizations. 
cache hot getters.
reduce number of calls to getBeltFacing() in BeltRenderer.
preserve floating point accuracy over (insanely) long play times.
rotate some normals and light some quads.
 2021-02-08 21:17:25 -08:00
simibubi
4a5479838c Merge branch 'mc1.15/dev' into mc1.15/metadoc 2021-02-08 16:51:52 +01:00
Snownee
607dbbfb90 Fix PSI item dupe 2021-02-08 22:40:55 +08:00
JozsefA
ee9962b27b fix some new rendering issues that popped up after the revert 
proper? optifine shader handling. could use more testing
 2021-02-07 22:11:29 -08:00
JozsefA
c9ff31b099 hot swappable rendering 
kind of detects optifine
still some kinks to work out
 2021-02-07 14:15:52 -08:00
simibubi
dd94cdd3f8 Register world features properlyTM, Part II 
- Re-enabled ability to control create world-gen with a global flag
 2021-02-07 21:32:37 +01:00
simibubi
dc13ea6485 Register world features properlyTM 
- Refactored Create's config-driven worldgen to better work with the feature infrastructure of 1.16. Adresses #539
 2021-02-07 21:27:55 +01:00
simibubi
cb2c56d772 Gantry shaft placement assist 2021-02-07 18:09:08 +01:00
Snownee
16991c2ce8 Fix NPE while deployer on a contraption trying to disassemble self 2021-02-07 15:49:25 +08:00
s0127943
d8054775d5 Removed unnecessary blocksnapshot.restore 2021-02-07 01:03:53 +01:00
s0127943
f3b6a684f9 Added check to see if a user is allowed to place blocks in the given position to counteract issues with FTBChunks 2021-02-07 01:01:48 +01:00
JozsefA
3e6ef34993 restore arm rendering 2021-02-06 14:39:58 -08:00
simibubi
a8d04cc152 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-02-06 22:43:01 +01:00
simibubi
6981848f8a Clean-up 
- Fixed smart chutes not filtering properly
- Fixed chutes not treating smart chutes like chutes
- Removed code leftovers
- Removed datagen cache from gitignore
 2021-02-06 22:41:20 +01:00
simibubi
d7a41b7810 Port new changes 
- Fix incompatible resource pack version
 2021-02-06 22:03:48 +01:00
simibubi
2700832dff Merge branch 'mc1.15/dev' into mc1.16/dev 2021-02-06 21:41:02 +01:00
Nick Smit
44a3313c12 Added the 'Paused' instruction for sequenced gearshift, which waits for another redstone pulse to continue. 2021-02-06 21:07:24 +01:00
simibubi
2315625c4b Quickfix 
- Fixed gantry shafts able to cause loops in kinetic connectivity when switching to powered state
 2021-02-06 18:11:35 +01:00
simibubi
bed5a1d03a
Merge pull request #965 from Snownee/mc1.15/security-patches 
Security patches
 2021-02-06 17:20:58 +01:00
simibubi
85110f3ce8
Merge pull request #906 from Snownee/mc1.15/dev 
Bug fixes
 2021-02-06 16:23:35 +01:00
simibubi
3d8b10d9a7 Gantry improvements 
- Fixed gantry shafts not locking to correct orientations when placed near others
- Gantry pinions can now be kickstarted by player interaction
- Gantry pinions now update properly after being moved onto different gantry shafts
- Fixed Encased Fans not providing kinetic power after being moved by contraption
- Sticky Mechanical Pistons now drag attached structures with them
- Mechanical piston heads and poles now drag their entire piston multiblock with them
 2021-02-06 16:07:22 +01:00
JozsefA
5ba4477ada restore old tile rendering from 3336778052 2021-02-06 02:26:56 -08:00
JozsefA
90993ce8e1 start working on schematic rendering 2021-02-05 22:48:55 -08:00
grimmauld
3d2edc492b Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-02-05 21:36:10 +01:00
Snownee
25daf28205 Format codes 2021-02-06 04:21:07 +08:00
Snownee
2baa3f9922 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/security-patches 2021-02-06 04:16:26 +08:00
simibubi
c85efe141f Soulfire heating 
- Integrate #724 on correct branch and through use of the data generator
 2021-02-05 18:49:10 +01:00
JozsefA
d50e07369b flywheels render with the new tech, and therefore have more accurate lighting 2021-02-04 19:21:25 -08:00
simibubi
72ec08ddfa Asset attack 
- Fixed floor-mounted cogbrackets not having a particle texture
- Redesigned clutch, gearshift, seq. gearshift and speed controller with up-to-date palettes
 2021-02-04 23:46:59 +01:00
simibubi
374f3c9547 Climb or Convey 
- Added Gantry shafts and Gantry pinions
- Further attempts at stabilizing kinetic propagation
- Contraption types can now be added from external code
- Kinetic tile entities now have more control over kinetic propagation rules
- Added backend for loading schematic configurations globally for any component to see
- Encased chain drives are less likely to create a kinetic source loop when wrenched
- Piston and Pulley contraptions are less likely to overshoot targets at high speeds
 2021-02-04 21:02:30 +01:00
JozsefA
456ed364a4 Fix another issue with ghost instances. 
Hopefully fix belt lighting issues.
 2021-02-04 00:03:37 -08:00
JozsefA
8c0e983f36 An absolutely ridiculous amount of refactoring. Shader system got a complete makeover, but still needs a little work. 
Objective was GL compatibility, now runs with 3.3, 2.0 is target.
Remove old tile rendering code. Need to bring back old old (vanilla) tile rendering code.
 2021-02-03 23:21:10 -08:00
JozsefA
b766658415 probably fix all issues with ghost instances 
instanced tiles on contraptions now self light properly
 2021-02-02 13:11:22 -08:00
JozsefA
f319dd5e8d fix #1 finally 
start work on shader abstraction
use backend for ebos
fix some issues with ghost instances, more work to be done
 2021-02-01 16:16:35 -08:00
Snownee
fc459732fc Fix chute item dupe (#939) 2021-02-01 16:46:36 +08:00
Snownee
d1e9b76a24 Make deployer still activate when it is triggering advancement 2021-01-31 19:54:27 +08:00
Snownee
7436ceb209 Fix stabilized contraption moving bearing block 2021-01-31 19:24:44 +08:00
Snownee
5c64c2d942 Add server-side check for extendo-grip and contraption interaction 2021-01-31 16:20:42 +08:00
Snownee
4a15fbcec3 Fix funnel filter dupe 2021-01-31 15:28:14 +08:00
Snownee
c5447d5b9c Add NBTProcessors to enable detailed control to tile data. 
Add safe check when contraption blocks adding back to world
 2021-01-31 14:56:46 +08:00
JozsefA
f6b68acbd5 contraptions self light but it's slightly less slow 2021-01-30 15:37:50 -08:00
JozsefA
16b8e1175e contraptions self light but man it is slow 
optimization in PlacementSimulationWorld.getBlockState
 2021-01-30 15:00:26 -08:00
Snownee
0c5e67e347 Merge branch 'mc1.15/security-patches' of https://github.com/pau101/Create into mc1.15/security-patches 2021-01-31 03:44:18 +08:00
Snownee
3525ce49ce Player Feedback, Part I 2021-01-31 02:12:31 +08:00
Snownee
c77e7c28d7 Fix gauge not rendering behind door 2021-01-30 21:14:58 +08:00
Snownee
7221f72ddf Optimize contraption assembling 2021-01-30 21:09:04 +08:00
Snownee
08a20972aa Fix broken render state in RenderWorldLastEvent 2021-01-30 18:51:44 +08:00
Snownee
5a664d6d85 Fix monster spawning on framed glass 2021-01-30 18:35:13 +08:00
JozsefA
1de931a122 make pulley key null, could avoid a crash 2021-01-28 14:41:54 -08:00
JozsefA
b63466774b probably fix the NPEs 
start work on adaptive backend
extra sanity stuff for the render manager
massive speedup when rendering a lot of tile entities
 2021-01-28 14:39:34 -08:00
JozsefA
04ccf6e738 belt light 2021-01-27 16:28:39 -08:00
JozsefA
e690f2b8ac okay you can use it now 
fixed a lighting bug (with a hack, again)
everything now uses the new api
(kinetic components on contraptions are slightly broken)
 2021-01-27 14:03:18 -08:00
simibubi
433a508107 Find-Replace for Command Blocks 
- Added a new utility command for map-making purposes
 2021-01-27 14:26:14 +01:00
JozsefA
67d59540cf THIS IS NOT READY FOR USE 
new rendering api/pipeline
not everything is there yet, but a lot is
 2021-01-26 19:45:13 -08:00
_0Steven
53a6ad00d5 Crushing More Bugs 
-Increase the size of the window in which the crusher picks up items to avoid it skipping over items at some of the highest speeds.
 2021-01-26 19:11:45 +01:00
Snownee
b958be0712 Fix desync of FilteringBehaviour 2021-01-26 18:00:47 +08:00
Snownee
8f7945ff4e Fix rope pulley breaking bedrock 2021-01-26 16:48:03 +08:00
Snownee
92a1395b14 Fix spectator can interact with blocks 2021-01-26 15:26:01 +08:00
Snownee
2c3a866494 Fix contraption sticky block connectivity. Add support to PUSH_ONLY push reaction 2021-01-26 15:05:02 +08:00
_0Steven
f1c8e92686 Horizontal Crushers Bugfix 
-Fix bug where horizontal crushers would input items they just output when the belt was 'facing' the opposite direction.
 2021-01-25 16:39:47 +01:00
JozsefA
1874b267b3 fix a contraption lighting glitch 2021-01-25 01:58:39 -08:00
JozsefA
93353b61d6 smarter light volumes 
start the process of creating sane gl abstractions
stabilized contraption bounds now fit tightly with them
fix global tile entity issues
 2021-01-25 01:17:55 -08:00
JozsefA
7bac93a03c fix drill orientation issue in contraptions 2021-01-25 00:24:07 -08:00
_0Steven
7b5737cf82 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev 2021-01-24 16:53:20 +01:00
_0Steven
cb25c5ab21 Omnidirectional Crushing 
-Fix directionality of horizontally placed crushing wheels.
-Allow crushing wheels to work omnidirectionally
-Allow downwards crushers to deposit directly into belts/chutes/depots and such below.
-Allow horizontal crushers to take input from belts going below them.
-Allow horizontal crushers to deposit directly into belts/chutes/depots and such placed below, offset by one in the output direction.
-Crushers stall when they have a valid output block but cannot actually output.
-Crushers outputting in any direction except down will shoot out the item entities with some speed.
-Crushers can take entity input from their corresponding input directions rather than just up. However, outputting the entity drops in the right location does currently not work consistently.
 2021-01-24 16:46:07 +01:00
simibubi
9d7ddbc326 Entry point 2021-01-24 14:30:05 +01:00
JozsefA
f05497a28c okay the synchronized functions didn't actually fix it 
but now we actually benefit from the tile entity render filtering, another 2x ish performance
 2021-01-24 01:07:22 -08:00
JozsefA
59e29ac958 that was a nasty crash 
os memory exception because memory that was being sent to the gpu was getting modified by another thread
 2021-01-23 23:32:23 -08:00
JozsefA
ebd20f5173 suddenly, everything is smooth and dry 
- replace all usages of Minecraft.getRenderPartialTicks() with AnimationTickHolder.getPartialTicks()
 - refactor stabilized and mounted lighters into one class
 - separate fancy contraption render logic and entity render logic, should maybe move *all* rendering to ContraptionRenderDispatcher
 2021-01-23 23:07:12 -08:00
JozsefA
55ea7e3e55 cart contraptions are lit 2021-01-23 21:02:11 -08:00
JozsefA
dea3f05364 fix saws not rendering their shafts in contraptions 2021-01-23 16:39:11 -08:00
simibubi
d35bdab51a The return of dyed belts 
- Dyes can now be used to change the appearance of Mechanical Belts
- Fluid items containing water can be used to clean dyed belts
 2021-01-23 23:00:27 +01:00
JozsefA
83cb735e62 actors render correctly 2021-01-23 12:49:33 -08:00
JozsefA
cfd60fbc8d fast actor rendering but it's not correct yet 2021-01-22 18:00:14 -08:00
grimmauld
fbb1c6b221 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 
# Conflicts:
#	src/generated/resources/.cache/cache
#	src/generated/resources/assets/create/lang/unfinished/de_de.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/generated/resources/assets/create/lang/unfinished/ru_ru.json
#	src/generated/resources/assets/create/lang/unfinished/zh_cn.json
 2021-01-22 20:56:46 +01:00
simibubi
525fc03278 Demise of the hopper funnel 
- Added smart chutes
- Reworked non-mounted funnels to be consistent will all other funnel configurations
- Non-mounted funnels no longer occupy a full block length
- Non-mounted funnels can now insert and extract ground items
- Vertical funnels can no longer transfer between inventories
- Redstone links can now be placed onto any non-empty space
- Mechanical arms no longer arbitrarily wait between operations unless targets are overflowing
- Gave indicators on funnels better visibility
- Chutes now display contents in their goggle overlay
- Mechanical Arms and Wrenches can no longer be assigned to filter slots directly
 2021-01-22 20:43:59 +01: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
JozsefA
11f9c7459c prepare for fast actor rendering 2021-01-21 14:14:20 -08:00
JozsefA
697a7df59c suddenly and magically, contraption rendering is 100% accurate 2021-01-21 12:26:55 -08:00
grimmauld
28cd9a1fe1 Druidcraft woodcutter compatibility 2021-01-20 22:36:04 +01:00
JozsefA
33e66c6e89 pulleys are lit 
stabilized things are sort of lit but man is it jank
light volumes have a more sane constructor
try to mess around with contraption layering but it's still jank
 2021-01-20 00:47:40 -08:00
JozsefA
9df796029f rename the confounding function 2021-01-18 00:35:16 -08:00
JozsefA
398a848791 pistons are lit and bearings are better lit in the corners 
stop sampling light in places that don't matter
 2021-01-18 00:31:33 -08:00
JozsefA
22a90c8e5d on our way to super fancy contraption lighting 2021-01-17 22:18:31 -08:00
JozsefA
37e64e4c1d fix vertex attribute data types 
blockcolors and ao now work in contraptions
be smarter about allocating buffers
use gl buffer mapping, more to come
 2021-01-15 16:17:13 -08:00
JozsefA
5ea0fa788f Make the last tile of its kind disappear 2021-01-15 14:26:27 -08:00
JozsefA
0bc6b11c5b be smart about rebuilding things 
not smart enough about contraptions yet
things mostly render in the correct layers
 2021-01-14 14:00:20 -08:00
Snownee
b1b771ed2e Fix extendo grip applying knockback on arrow or tnt damage 2021-01-14 12:34:41 +08:00
Snownee
5d0674067f Fix TooltipHelper formatting 2021-01-14 11:52:48 +08:00
grimmauld
6af884edb7 Merge https://github.com/Creators-of-Create/Create into mc1.15/experimental-rendering 2021-01-13 22:41:59 +01:00
JozsefA
64b5683ac4 things actually pause when paused 2021-01-13 13:24:45 -08:00
JozsefA
03205c277b move render package up one level 2021-01-13 12:15:48 -08:00
simibubi
f41f7b3efa Merge branch 'mc1.15/dev' into mc1.16/dev 2021-01-13 18:31:38 +01:00
simibubi
511950b766 Hotfix the fix 
- More safety for the minecart controller capability
- Blaze burners now support comparators
 2021-01-13 18:28:29 +01:00
grimmauld
07b33b66cc Merge https://github.com/Creators-of-Create/Create into mc1.15/experimental-rendering 2021-01-13 16:34:45 +01:00
simibubi
877d6dc2ee Merge branch 'mc1.15/dev' into mc1.16/dev 2021-01-13 15:50:32 +01:00
simibubi
de55778fc5 Extendo clip 
- Fixed extendo grips able to attack entities behind blocks
 2021-01-13 15:49:55 +01:00
simibubi
8ba0099e60 Ancient porting oversight 
- Fixed mechanical belts playing destroy effects when placed
 2021-01-13 15:30:25 +01:00
simibubi
27b5f5b479 Port new changes 2021-01-13 15:24:48 +01:00
simibubi
db3a579b21 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-01-13 15:11:58 +01:00
simibubi
f47d1e87c1 You were moved 
- runData
- Tried addressing some redstone activation inconsistencies with disassembled contraptions
 2021-01-13 14:55:29 +01:00
simibubi
9d5ae97a0a Thank you weakref, very deterministic 
- Cart controller safety #669, #684, #702, #708, #709, #714, #719, #722, #725, #728
- Update Registrate #662, #677, #697, #726
- Fixed blocks not able to be placed onto a face with super glue
- Fixed block duplication involving super glue #681, #682
- Fixed fluid tanks voiding content on contrapion disassembly #707
 2021-01-13 14:16:45 +01:00
grimmauld
2b615b68bd Fix mixins outside dev env 2021-01-13 09:50:00 +01:00
JozsefA
93a1983302 maybe this actually fixes the memory leak 2021-01-12 22:00:24 -08:00
JozsefA
e5b61891fc update forge and setup mixins 2021-01-12 21:58:40 -08:00
JozsefA
d1dccffc67 fix fan shaft lighting 2021-01-12 12:12:44 -08:00
JozsefA
0ec312340f rainbow debugging and almost correct tints for contraptions 2021-01-12 01:56:30 -08:00
JozsefA
c567437ede fix speed controllers not rendering shafts 
switch around render layers for contraptions
 2021-01-11 12:08:13 -08:00
JozsefA
1bc99f5224 maybe magically fix all crashes? 2021-01-11 11:15:45 -08:00
JozsefA
a56d08b78e a bunch of refactoring to make things easier later 
it's not any more stable but belts render on contraptions
rotating things almost do
actually fix a bunch of memory leaks
 2021-01-11 00:29:02 -08:00
JozsefA
092a92f095 reorganize some stuff 
cart contraptions should at least be positioned correctly
maybe fix a bunch of memory leaks
 2021-01-09 21:59:11 -08:00
JozsefA
d2173614dc move lightvolumes down 1 to fix darkness on bottom of contraption 2021-01-09 16:38:30 -08:00
JozsefA
83fa7d34a8 Merge remote-tracking branch 'origin/mc1.15/experimental-rendering' into mc1.15/experimental-rendering 2021-01-09 16:34:31 -08:00
JozsefA
876ddde660 correct contraption lighting 2021-01-09 16:34:22 -08:00
grimmauld
43be3ef8d5 Fix incomplete Render state reset, now doesn't break Journeymap waypoint overlay anymore 2021-01-09 13:16:05 +01:00
JozsefA
7443ac5031 start fixing structure tint 2021-01-08 14:53:22 -08:00
JozsefA
05ab482f70 almost super fast kinetic rendering but we need to detect changes in light first (forge pr?) 
fast contraption rendering
 2021-01-08 01:29:18 -08:00
JozsefA
fa1e3ea543 solve lighting 2021-01-07 18:31:46 -08:00
JozsefA
0b3615b50e time for some organization pt I 2021-01-07 14:57:10 -08:00
JozsefA
ba2d84e92e whoops 2021-01-07 02:48:24 -08:00
JozsefA
7beeec5e00 maybe lighting is done 
starting fast contraption rendering, not safe to use yet
 2021-01-07 02:06:40 -08:00
JozsefA
029f56da57 maybe fix held item rendering 2021-01-06 13:02:57 -08:00
JozsefA
d391ed570e maybe fix weird rendering in front stuff 2021-01-06 00:04:19 -08:00
JozsefA
a52b606208 all belts render correctly 2021-01-05 14:49:23 -08:00
JozsefA
5144aa6e63 belts scroll the right way, vertical belts still aren't rotated correctly 2021-01-05 14:39:11 -08:00
JozsefA
0b1f73de89 missed a comment 2021-01-05 13:32:50 -08:00
JozsefA
566a370e3b smooth belts 2021-01-05 13:29:45 -08:00
grimmauld
7deb72baa1 Get stuff to compile, clean up unused imports 2021-01-05 11:02:30 +01:00
JozsefA
102e392ab4 merge experimental rendering from 1.16 to 1.15 part II 2021-01-05 10:58:31 +01:00
JozsefA
7d43bb056a merge experimental rendering from 1.16 to 1.15 2021-01-05 10:56:47 +01:00
simibubi
19434988a7 Port new Changes 2021-01-04 14:16:06 +01:00
simibubi
bf73a24401 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-01-04 14:15:53 +01:00
simibubi
a1cac6d852 Why are we still here, 1.16 Special 
- Removed invalid compat recipe containing a removed item from the mod "Charm"
- Added sawing recipes for Crimson and Warped stems
- Adjusted crushing outputs of nether wart blocks
- Fixed Deployers unable to break leaves and other specific translucent blocks
- Saws and Deforesters can now take down Crimson and Warped fungus
 2021-01-03 23:35:03 +01:00
simibubi
1498cb1cfc Why are we still here, Part IV 
- Mixers can no longer process single-item recipes
- Added processing recipes for items in AE2
- Fixed pams harvestcraft recipe catalysts not recycling properly
- Windmill bearings no longer assemble when the attached kinetics update
- Hose pulleys now display additional goggle info when their target fluid body is considered infinite
- Protected the natural scoria model from vertex-format changes made by optifine
- Andesite tunnels now split off single items to side outputs
- Fixed non-interpolated item animation on the Mechanical Saw
- Attempted fix to oriented contraption causing serialization issues
- Fixed mounted contraptions not updating yaw interpolation when stalled
- Fixed "shifting gears" advancement not triggering when using the cogwheel placement assist
- Schematicannons no longer cause pasted kinetic networks to be virtually interconnected
- Added sandstone -> sand; milling/crushing recipe
- Fixed Spouts duplicating container items in some configurations
- Fixed block cutting recipe outputs piling up beyond the gui boundaries
 2021-01-03 22:29:55 +01:00
garyantonyo
d702784293 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create.git into mc1.15/dev 2021-01-01 22:51:56 -05:00
garyantonyo
089ed5ca6f Adding support for Ice and Fire silver and copper, even though Ice and Fire does not support Create... 2021-01-01 22:46:04 -05:00
simibubi
cdf292295a Why are we still here, Part III 
- Fan washing now supports up to 12 output stacks. For your textbook skyblock insanity. #620
- Chance outputs below 1% no longer show 0% in their tooltip
- Fixed creates components picking up dead items #618
- Fixed server-side crash when disassembling contraptions containing a creative crate
 2020-12-31 16:02:59 +01:00
garyantonyo
76c17d32e2 add lead crushed ore recipes when Eidolon present 2020-12-31 02:06:57 -05:00
simibubi
d5ac8cb3b9 Why are we still here, Part II 
- Fixed basins dropping outputs when no spoutput is present
- Lowered overfeeding threshold for blaze cakes
- Brass tunnels no longer distribute in directions against their mounted belt
- Fixed capability issues on millstones
- Fixed incompatibility with The One Probe
 2020-12-29 20:45:21 +01:00
simibubi
788f92705d Why are we still here 
- Added chocolate and tea fluid tag #580
- Fixed item drain accepting stacks of items to empty
- Fixed basins mistakingly ignoring recipes with 4 or 9 equal ingredients
- Fixed schematicannon not able to place glass pipes, encased pipes, belt funnels and encased shafts
- Fixed race condition with other mods registering spawn eggs
- Belts no longer consume dye
- Tweaked placement constraints and control of cogwheels
- Chocolate and honey buckets can no longer stack
- Minecarts can now collide with non-mounted contraptions
- Attempted some optimizations to contraption lighting
 2020-12-27 23:09:19 +01:00
Snownee
49b5e4957e Fix a typo 2020-12-25 18:11:13 +08:00
Snownee
6df81c8272 Fix belt funnel disappearing on contraption 2020-12-25 17:34:45 +08:00
Snownee
e554c5a3ff Solution to #571 2020-12-25 16:06:32 +08:00
Snownee
0cc6fe1de7 Fix liquid tank contents not being rendered (#588) 2020-12-24 21:28:12 +08:00
Snownee
01602c8e77 Fix: Honey block don't have same ability as slime block (#576) 2020-12-24 18:15:36 +08:00
simibubi
2d92eb0441 Port recent changes 2020-12-22 13:31:23 +01:00
simibubi
c3c834bd2b Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-22 13:31:14 +01:00
simibubi
32b0a01c3a The magical bucket 
- Fixed basins consuming container items with certain output inventories
- Potentially fixed item duplication with stale contraption inventories
 2020-12-22 13:18:44 +01:00
grimmauld
6b5e223508 Fixed a big dumb dumb 2020-12-21 16:28:08 +01:00
simibubi
ebf980b33c Itetraitor 
- Fixed crash for schematics containing TE's that have no custom renderer attached
- Fixed broken filling recipes with virtual fluids of other mods
- Fixed Brass tunnels duplicating/deleting items
 2020-12-21 16:05:32 +01:00
grimmauld
0fe8a24041 Controlling the Assembler 2020-12-21 13:03:16 +01:00
grimmauld
f3653d6b15 Fix TE creation assuming other mods don't crash with SchematicWorld instances (#565) 2020-12-21 09:28:41 +01:00
grimmauld
9336931f30 Press no longer go brrr, just bonk 2020-12-21 09:04:11 +01:00
grimmauld
ae399e9c11 Hopefully fix splitter basin duping #557 
Some more thorough testing is needed here to see whether it is actually fixed. I can't reproduce it anymore at least.
 2020-12-20 21:48:27 +01:00
simibubi
89ce9ef826 Bug Fixes 
- Fixed broken serialization of carriage contraptions
- Fixed fluid tags crashing the hose pulley
 2020-12-19 21:15:04 +01:00
simibubi
59b033f3be Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-19 18:34:51 +01:00
simibubi
2a57de3205 Bug Fixes 
- Fixed basin not triggering a recipe check when output fluids are emptied
- Fluid behaviour safety on render thread
- Wrenchable Depots
 2020-12-19 18:05:37 +01:00
Zelophed
5a178d2425 Merge branch 'mc1.15/dev' into mc1.16/dev 
# Conflicts:
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonExtensionPoleBlock.java
#	src/main/java/com/simibubi/create/foundation/utility/placement/IPlacementHelper.java
#	src/main/java/com/simibubi/create/foundation/utility/placement/PlacementOffset.java
 2020-12-19 16:19:52 +01:00
Zelophed
f45c0ca182 Assisted Placement, Part II 
- helpers now respect waterlogging
- add placement helpers for rsc's cogwheel as well as machines with integrated cogwheels
 2020-12-19 15:58:03 +01:00
simibubi
ba830dd8d3 Version specific goofage 
- Fixed Deployer not activating blocks
 2020-12-19 13:39:06 +01:00
simibubi
ea26ed8a01 Port recent Changes 2020-12-19 13:25:54 +01:00
simibubi
164dae700d Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-19 13:25:38 +01:00
simibubi
e2437d1a5c Bug Fixes 
- Fixed hose pulley not placing source blocks when filling with chocolate or honey
- Added a fluid tag to prevent bottomless draining behaviour of hose pulleys
- Grindstones can now be moved on contraptions
- Fixed fluids zFighting the item drain
- Added some crash safety for coupling rendering
- Updated mixer tooltip
 2020-12-19 13:06:09 +01:00
grimmauld
0182316d36 Waterlogged glass pipes 2020-12-19 11:59:56 +01:00
simibubi
5b3e1e8c38 Prime patching material 
- Fixed open pipe ends not providing fluids to pipe networks
- Safety check for pipe attachment rendering
 2020-12-19 00:52:41 +01:00
simibubi
ecd5858ece Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-18 18:36:51 +01:00
simibubi
62621f8bdd Mildly problematic 
- Fixed broken kinetic propagation caused by bracket handling
- Fixed crash when fluid-interfacing with a contraption loaded from disk
 2020-12-18 18:30:58 +01:00
simibubi
6c6760ef17 More content, who dis? 
- Sprite touch-ups by vectorwing
- Builders Tea
- Bar of Chocolate
- Fixed spouts not rendering fluid particles of virtual fluid types
- Fixed spouts filling bottles inconsistently
 2020-12-18 15:13:57 +01:00
simibubi
6660718aff Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-17 23:32:11 +01:00
simibubi
68e7d3c34c Bug Fixes 
- Snownee's basin render fix
- Fixed milk fluid exchange between vanilla items and the create fluid infrastructure
 2020-12-17 23:29:33 +01:00
simibubi
4c91397fbb Tooltip fix 
- Cleared more remnants of the broken text component transition
 2020-12-17 12:35:23 +01:00
Zelophed
1cdfa6c17e Port recent changes 2020-12-16 18:09:15 +01:00
Zelophed
51229ce517 Merge branch 'mc1.15/dev' into mc1.16/dev 
# Conflicts:
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/SailBlockPlacementHelper.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonExtensionPoleBlock.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonPolePlacementHelper.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/elementary/CogWheelBlock.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/elementary/CogwheelBlockItem.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/elementary/ShaftBlock.java
#	src/main/java/com/simibubi/create/events/ClientEvents.java
 2020-12-16 17:57:37 +01:00
Zelophed
e950aa268f Assisted Placement, Part I 
- refactor existing placement helpers
- add placement helpers for cogs and shafts
 2020-12-16 17:36:22 +01:00
simibubi
743d303bbe Fix #527 2020-12-16 11:32:12 +01:00
simibubi
fa6bac2bfc Locally sourced arms 
- Mechanical arms now serialize target positions in relative coordinates
 2020-12-16 11:16:46 +01:00
simibubi
67cb69aaea Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-15 23:21:52 +01:00
simibubi
64b2c61389 Bug fixes 
- Fixed spout creating potions from any fluid
- Fixed pipes not actually transferring the type of fluid selected by layer II flow propagation
- Fixed some fluid handlers erasing nbt data of extracted fluidstacks
- Fix sidedness issues in Config packets
 2020-12-15 23:13:22 +01:00
simibubi
f8b3a77f26 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-12-15 21:16:21 +01:00
simibubi
1840b40e2e Advancing toward the day 
- Added advancements for exploring the content
- Adjusted some recipes
 2020-12-15 21:16:17 +01:00
tterrag
4c26627b73 Fix blaze burner consuming buckets, arm no longer inserts lava buckets 2020-12-13 15:04:55 -05:00
simibubi
bb5efd68f1 Fix #535 2020-12-13 18:23:45 +01:00
simibubi
78036195ab Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-13 15:33:45 +01:00
simibubi
d68d702b3a Fun with Recipes 
- Added a couple of recipes involving fluids and things
 2020-12-13 15:17:31 +01:00
Snownee
a845a70885 Material checklist I18n 2020-12-13 19:56:49 +08:00
Snownee
48d66c7e55 Slightly improve redstone link performance 2020-12-13 08:19:28 +08:00
simibubi
4b597f7b86 Mek has more metals now 
- Also reduced speed penalty of coupling hard-collision
 2020-12-12 17:57:48 +01:00
simibubi
a50b9bc6d1 Port new changes 2020-12-12 17:42:19 +01:00
simibubi
7760db875c Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-12 17:42:12 +01:00
simibubi
45465fb69b Minor adjustments 
- Fluid tanks are not nbt safe
- Mekanism uses reversed ids
 2020-12-12 17:33:16 +01:00
simibubi
a26988db70
Merge pull request #533 from Creators-of-Create/mc1.15/safe-nbt 
Safe NBT tag
 2020-12-12 15:37:44 +01:00
Snownee
f3053d7e45 Remove unused imports 2020-12-12 19:39:02 +08:00
Snownee
24dcb5383a Make the zapper selection logic server-side (#515) 2020-12-12 19:32:32 +08:00
Snownee
f64dc8c43f Signs are not nbt-safe, due to the ability to execute command 2020-12-12 19:10:59 +08:00
Snownee
0941d9403f Zappers Safe-NBT support 2020-12-12 19:09:10 +08:00
Snownee
1a052d1ec1 Tag data-gen 2020-12-12 05:00:25 +08:00
simibubi
065be4dc96 Porting hiccups 
- Fixed missing items rendering flipped in the schematicannon UI
- Fixed broken formatting in Material Checklists
 2020-12-11 21:35:27 +01:00
simibubi
42215b8eb0 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-11 21:23:31 +01:00
simibubi
2744cabf14 How to 0.3 
- Updated and Finished up remaining item/block tooltips
- Encased belts are now called encased chain drives for easier distinction
 2020-12-11 19:36:13 +01:00
Snownee
517a4f0824 Allow schematicannon to persist some safe block data 2020-12-11 20:03:16 +08:00
simibubi
1433bcb4ef Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-12-11 13:02:07 +01:00
simibubi
17ba73dedf Thermal compat 
- Apparently this mod is still a thing
 2020-12-11 13:02:04 +01:00
Snownee
550e058ec5 Fix SchematicannonScreen tooltip handling 2020-12-11 18:36:29 +08:00
Snownee
727de5425f Hide goggle overlay if ValueBox is hovered 2020-12-11 17:00:36 +08:00
Snownee
f425b150bd Fix crash if mechanical piston pushes a bed 2020-12-11 15:52:09 +08:00
Snownee
e529c254c8 Fix block zapper not updating blocks correctly 2020-12-10 15:01:11 +08:00
Snownee
7f95a16b5e Merge branch 'mc1.15/dev' into mc1.15/snownee 2020-12-10 09:37:42 +08:00
Snownee
77e9a75877 Use cached directions 2020-12-10 09:36:59 +08:00
simibubi
f7c5c51fd2 Port recent changes to 1.16 2020-12-09 21:05:12 +01:00
simibubi
afa477d81b Merge branch 'mc1.15/dev' into mc1.16/dev 2020-12-09 21:00:06 +01:00
simibubi
2772ead740 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-12-09 18:57:54 +01:00
simibubi
f9b09c213b Ported #528 to 1.15 2020-12-09 18:57:29 +01:00
simibubi
360fd38d5d
Merge pull request #529 from Snownee/mc1.15/snownee 
Bug fixes
 2020-12-09 18:49:04 +01:00
simibubi
f4961e5ede The polish continues 
- Fixed water bottles able to be gather by clicking honey or chocolate fluids
- Fixed deployer not parting with its excess items
- Added hint message for backed up deployers
- Fixed basin spoutputs appearing on blocked faces
 2020-12-09 18:45:47 +01:00