Commit Graph

1529 Commits

Author SHA1 Message Date
PepperBell
4ed97b3655 Fix super glue rendering
- Fix super glue normals, rotation, and reflection.
- Move render check to appropriate method.
- Minor optimizations.
2021-05-06 14:10:12 -07:00
simibubi
187c448513 Deploying items on items
- Added the Deploying recipe type
- Deployers can now polish items on belts or depots
- Deployers now make a little polishing sound when using sandpaper
2021-05-06 16:40:33 +02:00
JozsefA
9736ba19b5 Things here and there
- Move CreateClient.kineticRenderer to Backend
 - InstancedTileRenderers keep track of their own queuedUpdates
 - Sort of a listener system for some render events
2021-05-04 23:56:50 -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
b6f13aa7ff More granularity for shader context loading 2021-05-04 16:22:27 -07:00
PepperCode1
b0dad3bf79 Merge branch 'mc1.16/dev' of https://github.com/Creators-of-Create/Create into mc1.16/fix-bugs 2021-05-04 12:18:55 -07:00
zelophed
ca4ca11232 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-05-04 20:09:18 +02:00
simibubi
859d9fccf6 RenderType hotfix 2021-05-04 18:44:02 +02:00
simibubi
b38dd90431 Subcreatica, Part II
- Diving helmets now display a timer near the hotbar when underwater
- Copper backtanks now play an effect when accumulated air is maxed
- Copper backtank blocks can now be waterlogged
- Copper backtank cogs now animate
- Fixed subtitle of equip sounds
2021-05-04 18:04:00 +02:00
zelophed
dc6baae0ea add a missing placement helper
- for placing small cogs against integrated cog wheels
2021-05-04 17:17:09 +02:00
zelophed
3c4e504f61 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev
# Conflicts:
#	src/main/java/com/simibubi/create/events/ClientEvents.java
#	src/main/resources/create.mixins.json
2021-05-04 16:12:07 +02:00
JozsefA
bc5630e593 ShaderContexts
- A huge step towards more arbitrary shader usage
 - Need to work on registration of the different parts
 - Things are unorganized
2021-05-03 21:46:33 -07:00
PepperCode1
163361f5ca Merge branch 'mc1.16/dev' of https://github.com/Creators-of-Create/Create into mc1.16/fix-bugs 2021-05-03 19:55:21 -07:00
simibubi
076783eb7e Subcreatica
- Added the Copper Backtank
- Added Diving helmet and boots
2021-05-04 03:50:17 +02:00
PepperBell
77ee23c208 Fix crate rarity 2021-05-03 18:35:57 -07:00
JozsefA
fcbab5b820 #flwbuiltins and oh so much less overhead
- Put a lot of the reusable code in a sort of standard library
 - Need to evaluate just how much should be lumped in there
 - Still need to allow for users to create alternate contexts for the builtins
 - Normal world and contraptions are still hardcoded contexts
2021-05-03 13:42:23 -07:00
zelophed
fd62f2f8f4 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev
# Conflicts:
#	src/main/java/com/simibubi/create/CreateClient.java
#	src/main/java/com/simibubi/create/compat/jei/category/BlockzapperUpgradeCategory.java
#	src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandScreen.java
#	src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperScreen.java
2021-05-03 19:58:39 +02:00
zelophed
2442e3ac00 merge & comment cleanup 2021-05-03 18:25:57 +02:00
zelophed
c36346b97d Merge branch 'mc1.16/config-ui' into mc1.16/dev
# Conflicts:
#	src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleConfigScreen.java
#	src/main/java/com/simibubi/create/foundation/command/AllCommands.java
#	src/main/java/com/simibubi/create/foundation/command/FabulousWarningCommand.java
#	src/main/java/com/simibubi/create/foundation/command/OverlayConfigCommand.java
#	src/main/java/com/simibubi/create/foundation/command/PonderCommand.java
#	src/main/java/com/simibubi/create/foundation/command/ToggleDebugCommand.java
#	src/main/java/com/simibubi/create/foundation/command/ToggleExperimentalRenderingCommand.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/AllIcons.java
#	src/main/java/com/simibubi/create/foundation/gui/UIRenderHelper.java
#	src/main/java/com/simibubi/create/foundation/ponder/NavigatableSimiScreen.java
#	src/main/java/com/simibubi/create/foundation/ponder/PonderProgressBar.java
#	src/main/java/com/simibubi/create/foundation/ponder/PonderUI.java
#	src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndexScreen.java
#	src/main/java/com/simibubi/create/foundation/ponder/content/PonderTagScreen.java
#	src/main/java/com/simibubi/create/foundation/ponder/ui/ChapterLabel.java
#	src/main/java/com/simibubi/create/foundation/ponder/ui/PonderButton.java
#	src/main/resources/create.mixins.json
2021-05-03 16:54:32 +02:00
zelophed
ae76821190 more changes to color and theme 2021-05-03 16:14:58 +02:00
JozsefA
35768b5ade Step towards arbitrary shader contexts 2021-05-02 14:16:02 -07:00
JozsefA
15f4cd305e Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector 2021-05-02 11:50:39 -07:00
simibubi
4974df5c99
Merge pull request #1544 from PepperCode1/mc1.16/model-cleanup
Cleanup Models and Custom Item Rendering
2021-05-02 17:42:48 +02:00
simibubi
b086fbd1f2
Merge pull request #1520 from PepperCode1/mc1.16/reload-listeners
Tweak Reload Listener Classes
2021-05-02 17:39:29 +02:00
JozsefA
2112061db0 Vertex shader abstractions 2021-05-01 23:39:36 -07:00
JozsefA
67e75d747a Move backend 2021-05-01 16:32:09 -07:00
JozsefA
2e16b85190 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector
# Conflicts:
#	src/generated/resources/.cache/cache
#	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/es_mx.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/generated/resources/assets/create/lang/unfinished/zh_tw.json
2021-05-01 16:18:32 -07:00
PepperBell
ffd4c75572 Merge remote-tracking branch 'upstream/mc1.16/dev' into
mc1.16/model-cleanup

Conflicts:
	src/main/java/com/simibubi/create/content/curiosities/tools/DeforesterItemRenderer.java
	src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItemRenderer.java
2021-05-01 15:46:50 -07:00
PepperBell
9be5a3ec2a Cleanup 2021-05-01 15:41:03 -07:00
simibubi
8fff3d6745 The great second purge of Tools
- Removed the Blockzapper
- Removed the Deforester
- Handheld Worldshaper -> Creative Worldshaper
- Worldshapers now have a "surface" and "cluster" brush type
- Worldshapers now follow the creative colour palette
- Some UI touch-ups for tools
2021-05-01 13:19:01 +02:00
JozsefA
dc3517eb3a Inversion 2021-04-30 14:28:18 -07:00
JozsefA
37e8e87553 Merge branch 'mc1.16/dev' into mc1.16/chromatic-projector
# Conflicts:
#	src/main/java/com/simibubi/create/foundation/render/backend/Backend.java
#	src/main/java/com/simibubi/create/foundation/render/backend/ShaderLoader.java
#	src/main/java/com/simibubi/create/foundation/render/backend/core/BasicProgram.java
#	src/main/java/com/simibubi/create/foundation/render/backend/gl/GlBuffer.java
#	src/main/java/com/simibubi/create/foundation/render/backend/gl/GlVertexArray.java
#	src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/FogSensitiveProgram.java
#	src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/GlProgram.java
#	src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/ProgramSpec.java
#	src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/GlCompat.java
#	src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/instancing/DrawInstanced.java
#	src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/instancing/InstancedArrays.java
#	src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/instancing/VertexArrayObject.java
#	src/main/java/com/simibubi/create/foundation/render/backend/instancing/InstancedModel.java
#	src/main/java/com/simibubi/create/foundation/render/backend/instancing/RenderMaterial.java
2021-04-30 12:15:32 -07:00
JozsefA
c9718b0a1b No more compartments in Flywheel.
It never really needed them in the first place.
2021-04-30 00:31:52 -07:00
JozsefA
322496f3b4 Reformat backend 2021-04-29 17:19:08 -07:00
JozsefA
d9b04138df Whoops flywheels are straight again 2021-04-29 15:12:08 -07:00
JozsefA
063e98983f Oh god the line endings
- Isolate AllBlockPartials to PartialModel
 - Further cleanup to PartialBufferer
2021-04-29 14:03:52 -07:00
JozsefA
446b24f1cf Random stuff
- Multiply by 31 in some hash functions
 - Remove unused render utility classes
2021-04-29 11:44:45 -07:00
JozsefA
e33ab160ac Start to cleanup the AllBlockPartials methods 2021-04-28 22:47:51 -07:00
JozsefA
81b0cf77e1 Contraption renderer checks for flywheel worlds
- Should fix an issue with smaller units
2021-04-28 22:08:45 -07:00
PepperBell
80921ebd6b Remove ISimpleReloadListener lambda types 2021-04-28 21:25:06 -07:00
PepperBell
9140c2ad4c Merge branch 'mc1.16/dev' of https://github.com/Creators-of-Create/Create.git into mc1.16/dev 2021-04-28 13:38:26 -07:00
PepperBell
61f2a35a61 Add ISimpleReloadListener
ISimpleReloadListener is a reload listener functional interface meant to
be used when preparation is not needed. All current reload listeners
have been moved to this interface, which allows them to be lambdas and
not have to create a new Object for every reload.
2021-04-28 13:37:21 -07:00
zelophed
f47feee20d its called padding
- also includes some more changes to theme and colors
2021-04-28 21:44:03 +02:00
JozsefA
18d23f69e0 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector
# Conflicts:
#	src/generated/resources/.cache/cache
#	src/generated/resources/assets/create/lang/en_us.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/es_mx.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/generated/resources/assets/create/lang/unfinished/zh_tw.json
2021-04-28 12:42:41 -07:00
simibubi
ab6b18e42d SoundScapes, Part III
- Increased minimum sound threshold for ambient noise
- Sounds for contraption (dis-)assembly
- Sounds for more wrench interactions
- Hand crank clicks less furiously
- Block breakers now make block breaking noises
- Crafting noises
2021-04-28 17:55:05 +02:00
JozsefA
54f5783489 More versatile ui/settings
- The channel mask still needs work
 - Add contrast filter
2021-04-28 00:01:26 -07:00
simibubi
35d0ce8387 Widget resize
- Condensed the main reading space of config UIs
- Reworked some of the widgets to better arrange themselves in a column
2021-04-27 20:07:29 +02:00
zelophed
de00f90a37 pondering all over again 2021-04-27 02:48:50 +02:00
zelophed
c85870ea2d boxing elements 2021-04-25 19:54:18 +02:00
JozsefA
70188889be Persistence is key
- Projectors now remember their setting and sync between clients
2021-04-23 17:20:16 -07:00
JozsefA
e8ab21c184 More polish
- UI icons
 - Color masking
 - Better scroll ux
 - FilterSphere now has its own file
2021-04-23 14:38:31 -07:00
zelophed
33028e1087 please confirm 2021-04-23 18:11:32 +02:00
JozsefA
3879d55517 Better projector gui 2021-04-22 23:42:49 -07:00
JozsefA
fc919c4ac4 Basic projector gui 2021-04-22 16:02:16 -07:00
JozsefA
7b7c6ef3c5 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector
# Conflicts:
#	src/main/java/com/simibubi/create/AllBlocks.java
2021-04-20 14:07:54 -07:00
JozsefA
f75422f895 Instruction parallel ray sphere intersection 2021-04-20 14:05:50 -07:00
simibubi
559146ef04 SoundScapes, Part II
- Picking items off belts, depots, basins
- Arms collecting an item
- Mixing noises
- Cranking click noises
- Scroll-input noises
2021-04-20 17:26:46 +02:00
simibubi
9391700c26 SoundScapes, Part I
- Sounds for depots, funnels, cogwheels and generic kinetic rumbling, also fans
2021-04-20 02:19:12 +02:00
JozsefA
e50590f6b7 Start working on the blocks
- Also better control and visuals
2021-04-18 22:23:41 -07:00
tterrag
9697a30d76 Remove references to antlr IntegerList in favor of fastutil IntList 2021-04-18 14:04:08 -04:00
JozsefA
a6248daf7e Better spheres and framebuffer compat layer 2021-04-17 18:55:29 -07:00
JozsefA
128a2c2e06 Remove compat layer wrapper functions 2021-04-17 18:54:57 -07:00
JozsefA
83dc241cd2 Basic spherical effect 2021-04-17 13:04:42 -07:00
zelophed
f0dfc5a6bc align style with ponderUI 2021-04-16 04:22:38 +02:00
simibubi
8a41cd57b0 Quality Software
- Temporary hotfix to Ponder block breaking animations
2021-04-16 01:57:43 +02:00
zelophed
6b80ea1d04 units and tooltips 2021-04-16 01:50:35 +02:00
simibubi
6db763ed5d Seat-hopping into oblivion
- Fixed Seat interaction being too restrictive with max reach
- Contraption seats can no longer be mounted while riding something else
2021-04-16 01:13:46 +02:00
JozsefA
fafd7c84be Everything works as intended 2021-04-15 15:39:34 -07:00
JozsefA
45b1412837 Code sanity 2021-04-15 13:28:23 -07:00
simibubi
db3c296792 Hotfix 2021-04-15 22:03:25 +02:00
JozsefA
f12d9452b4 Shader debugging: scaling the world
In the linearizeDepth function in area_effect.frag, I was multiplying by 2, but the scaling of the world was off. The number I found that works best is e - 0.99, and I have no idea why.
2021-04-15 12:46:54 -07:00
simibubi
3dfe67cd1e Minecarts of Mass Destruction
- Contraptions with exceeding spawn packet sizes no longer get sent to the client
- Minecart Contraptions with exceeding nbt packet sizes can no longer be picked up
- Renamed "Metal Blocks" to "Blocks of Metal"
2021-04-15 20:23:50 +02:00
zelophed
01e5b812c2 changing the server 2021-04-15 15:44:26 +02:00
simibubi
f9d48386ca Scanning the Far Lands for Rails
- Fixed basins not continuing their processing when items are extracted by funnel #1416
- Basins now accept full stacks for items thrown into the top manually
- Fixed Smart Chutes not dropping filter items
- Fixed Smart Chutes not updating attached diagonal chutes properly when removed
- Fixed Server-side crash when coupling two minecarts from a glitched self-colliding pile
2021-04-15 14:43:34 +02:00
simibubi
2fc26f1112 Defer. Everything.
- Millstone now accepts items from belts/ejectors directly
- Fixed Redstone-triggered components losing tile data after moved by a Contraption
- Super glue between non-solids can now be removed while the glue item is equipped
- Fixed Deployers not able to interact with glued blocks
- Fixed incorrect lang mapping of UI button descriptions
- Placement assist block preview now lights properly, doesn't z-fight and fades in gradually
- Pickaxe and Axe are now effective on piston extension poles
- Fixed block breaking animations inside the ponder UI
- Fixed Ponder Scenes rendering on top of the progress bar
- Fixed Mechanical Press not retracting when items were removed early
- Fixed Windmill Bearings allowing to be moved while assembled
- Mechanical Pistons now silence the "missing poles" error after poles were added
2021-04-15 05:19:15 +02:00
simibubi
13f0823ccb Sound Registry Refactor
- Improved registration and datagen for custom and combined sounds
2021-04-14 23:40:42 +02:00
JozsefA
7988fb69a7 Color matrices and many effect spheres 2021-04-13 23:52:52 -07:00
zelophed
fdbdf0ec8d completing the set 2021-04-14 03:27:11 +02:00
zelophed
bb8153f140 texting numbers 2021-04-13 23:54:26 +02:00
JozsefA
db7913d91b It all works, needs some cleanup 2021-04-12 16:00:13 -07:00
simibubi
e92e9a7139 Bad impression
- Mechanical Press can no longer create sheets in bulk, unless configured to
- Fixed Mechanical Press missing items passing on a belt while retracting
2021-04-11 15:24:58 +02:00
zelophed
5b04e82163 boolean toggle 2021-04-11 03:12:43 +02:00
simibubi
d249318b80 Pose stack says no
- TileEntities not appreciative of wrapped worlds are now much less likely to cause a hard crash
2021-04-11 02:56:11 +02:00
zelophed
3de3de89db finally some content 2021-04-10 20:00:32 +02:00
simibubi
976be3470f Better address these, Part II
- Fixed entities attempting to path-find through Creates' non-solids #1390
- Fixed Redstone Links occasionally wiping their frequency when moved in a Contraption
- Fixed Flywheels doubling their SU capacity after every chunk reload
- Fixed display of numeric formats using non-breaking space #1374
- Signs can now be moved on a contraption #1315
- Fixed Typo in german localization #1363
- Fixed Windmill Bearings keeping su information after relocation #1364
- Fixed Symmetry Wand using up too many items #1342
2021-04-10 18:23:42 +02:00
simibubi
9ee42c1824 Wrapped Hints
- Fixed goggle tooltips flipping to the left when too wide
- Can no longer drag the goggle overlay off-screen in the config ui
2021-04-10 03:49:41 +02:00
simibubi
5de2e1ea9d Ghostbusters
- Patched up yet another set of entry points to kinetic source loops
2021-04-10 03:26:38 +02:00
simibubi
939c640e14 Better address these
- Fixed Nixies rendering inconsistently
- Fixed belts not showing items under certain conditions
- Fixed vertical/sideways belts accepting items from other belts
- Spouts can now interact with belts/depots with a mounted funnel
2021-04-10 01:50:13 +02:00
JozsefA
62eb16241b Merge branch 'mc1.16/dev' into mc1.16/chromatic-projector 2021-04-09 16:43:21 -07:00
JozsefA
cbb7e48565 Revert "Don't crash with starlight"
This reverts commit 4ae1ce3d
2021-04-09 16:21:38 -07:00
JozsefA
08b2c498e6 Add basic blocks and TEs for the chromatic projector 2021-04-09 16:16:25 -07:00
JozsefA
536b8d2d5e Fix transparent contraption parts rendering strangely
- It was rendering as if it existed with your hand.
2021-04-09 15:23:51 -07:00
JozsefA
f2c6afdcb3 Fix projection matrix bug
- Copy the projection matrix when vanilla would be uploading it to GL.
 - This should account for just about everything.

Unrelated to the fix:
 - Shader programs now have more flexibility in specialization.
 - Accomplished with IMultiProgram.
 - Remove unnecessary SHADER_DEBUG_OUTPUT boolean.
2021-04-09 14:48:44 -07:00
simibubi
edb1b59f41 Housekeeping
- Added an .editorconfig
- Auto-Reformatted most .java files
- Auto-Organized Imports
2021-04-08 19:22:11 +02:00
zelophed
f9179b3b1d animated colors 2021-04-07 18:47:19 +02:00
zelophed
b1773e9e6b shadow cog 2021-04-07 15:18:37 +02:00
b10203db01 Extract block breaking in TreeCutter.Tree to AbstractBlockBreakQueue for better reusability and option of saw passing a different item 2021-04-07 15:13:07 +02:00
ac8c1e1468 Fixed unported stuff, tree cutter now does sound effects at the right probability again 2021-04-07 14:29:41 +02:00
2613c5be89 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-04-07 14:07:13 +02:00
f19c6ab763 - Deforester now hits forge hooks for tool break, block break, times used.
-Moved deforester not loosing durability from leaves to DeforesterItem instead of Tree mining
- added destroyBlocks method in TreeCutter$Tree for less doubled code
- Mechanical Saws currently break the tree with an empty "hand" as they did before
- Silktouch and Fortune enchants are now being applied from deforesters
2021-04-07 14:07:06 +02:00