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
fd030d3273
Post PR datagen
...
- Fixed worldshaper asset errors
- Removed zero-width spaces from pl_pl localization file (broke datagen)
- Regenerated unfinished lang templates
2021-05-02 19:37:39 +02: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
4f10f743b4
Merge pull request #1525 from CKenJa/mc1.16/dev
...
Update & fix ja_jp.json
2021-05-02 17:40:49 +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
simibubi
cc2541a476
Merge pull request #1482 from joker876/mc1.16/dev
...
Add pl_pl localization (Poland)
2021-05-02 17:38:36 +02:00
simibubi
dd82629e5d
Merge pull request #1460 from Chubzik1/patch-2
...
Small fix for advancements (ru_ru.json)
2021-05-02 17:35:33 +02:00
simibubi
57af793c16
Merge pull request #1456 from LWHK/mc1.16/dev
...
[Localization]Update CHS translation
2021-05-02 17:34: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
CKenJa
572b30f815
Update & fix ja_jp.json
...
credit: RakuGaki-MC
2021-04-29 18:58:23 +09: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
TUsama
caafd3baab
forgot it
2021-04-28 23:33:46 +08: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
joker876
b1e0057aad
Add 100% completed translation for Polish language
2021-04-21 15:19:56 +02: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
Chubz
6374f9f1ad
Small fix for advancements
...
Yep, it is.
2021-04-19 12:40:20 +04: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
TUsama
bb6b347cfe
update
...
Co-Authored-By: BigDaleAHA <56267928+BigDaleAHA@users.noreply.github.com>
2021-04-18 12:47:44 +08: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
grimmauld
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
grimmauld
ac8c1e1468
Fixed unported stuff, tree cutter now does sound effects at the right probability again
2021-04-07 14:29:41 +02:00
grimmauld
2613c5be89
Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev
2021-04-07 14:07:13 +02:00
grimmauld
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
simibubi
525001e410
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-04-07 12:36:39 +02:00
simibubi
ffa19dd354
Update data, move misplaced localization file
2021-04-07 12:00:00 +02:00
simibubi
c46e286844
Update Localization Readme.txt
2021-04-07 11:38:11 +02:00
simibubi
79bc9d35e1
Merge pull request #1348 from Hanqnero/ru-localization
...
Added some missing Ru localization
2021-04-07 11:37:29 +02:00
simibubi
1bc32d4b80
Merge pull request #1355 from Peatral/mc1.15/dev
...
Update de_de.json
2021-04-07 11:29:30 +02:00
JozsefA
f2b064fa49
Instanced rope pulleys
...
- The "magnet" texture is broken
2021-04-06 23:17:16 -07:00
zelophed
7ad0575618
fancy text
2021-04-07 02:17:55 +02:00
JozsefA
4b49763e0c
Got a weird crash profiling the slideshow machine
...
- Seems to be a race condition, try/catch should be good enough
2021-04-06 16:52:34 -07:00
JozsefA
40bdbc7048
Instanced rope pulleys
2021-04-06 16:46:24 -07:00
JozsefA
3a52fa573f
Merge branch 'mc1.15/dev' into mc1.15/pulley-instance
2021-04-05 23:44:27 -07:00
JozsefA
7a1445f00a
Fix nullpointer with starlight
2021-04-05 23:43:39 -07:00
JozsefA
4ae1ce3dbe
Don't crash with starlight
2021-04-05 23:23:35 -07:00
zelophed
d4994ddc8b
entry point
2021-04-06 00:05:29 +02:00
Christof
cbabd943fd
Typo
...
Whoops
2021-04-05 16:39:03 +02:00
Christof
330777045e
Update de_de.json
...
Added missing blocks and GUI stuff and fixed typos.
Now only
- Most advancements
- A lot of block summaries/tooltips
- All of the pondering
- All attributes
are missing
2021-04-05 16:15:00 +02:00
Hanqnero
ab4c0100a4
Fixed misspelling
2021-04-04 23:07:58 +05:00
Hanqnero
eb8e610743
Update ru_ru.json
...
Added some missing Ru Localization
102 added in total
2021-04-04 22:46:13 +05:00
JozsefA
3b05e06d35
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-04-03 18:45:23 -07:00
JozsefA
c55351e980
Fix nullpointer with starlight
2021-04-03 18:33:47 -07:00
simibubi
19020b39bf
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-04-04 01:53:50 +02:00
simibubi
3da35a30e3
Version up
2021-04-04 01:52:55 +02:00
simibubi
9dc528d96c
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-04-04 01:30:18 +02:00
simibubi
b05a03d417
Update NixieTubeBlock.java
...
- Revert rushed solution to auto nixie control
2021-04-04 01:30:01 +02:00
simibubi
307241e7fd
Port new Changes
2021-04-04 00:58:23 +02:00
simibubi
47bd1d9c93
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-04-04 00:58:14 +02:00
zelophed
e8338d4805
too much backtracking
2021-04-04 00:36:31 +02:00
JozsefA
9d99a5f968
Compromise for render bounding box caching
...
- Recalculating it once per tick is better than doing it every frame.
- Only ever doing it once has proven unreliable.
2021-04-03 15:08:06 -07:00
simibubi
62b1fe82b7
Fix-ups Cont'd
...
- Fixed Spawners losing nbt data when moved
- Nixie tubes now update their texts starting from the clicked block, rather than the leftmost one in the chain
- Fixed inconsistency between block and item model of the furnace engine
2021-04-03 23:49:59 +02:00
JozsefA
ba91eaa4ef
Probably fix ghost hands appearing by the player
2021-04-03 14:23:00 -07:00
simibubi
b845809b58
The great Escape
...
- Adresses #1324
2021-04-03 19:50:42 +02:00
simibubi
69c3a57c76
Quell the outrage!
...
- Placement indicator arrow is slightly smaller by default
2021-04-03 19:46:26 +02:00
simibubi
d1c8ad38fc
Chute extraction refactor
2021-04-03 19:41:33 +02:00
simibubi
9ab5c74929
Merge pull request #1340 from sarim/mc1.15/dev
...
allow smart chute to transfer whole stacks
2021-04-03 19:31:16 +02:00
simibubi
1fd6b4360c
Performant fictional entities
...
- Fixed crash with the Performant mod when entities are present in a ponder scene
2021-04-03 19:30:38 +02:00
simibubi
83e7074f12
Hot Fix-ups
...
- Change to proper key handling for closing create screens
- Fixed inconsistent collection behaviour of in-world funnels
2021-04-03 18:59:10 +02:00
simibubi
f528520a53
Destructive Pondering
...
- Fixed a couple overlooked ponder lang issues
- Fixed weighted ejector not accepting arbitrary gold plates in its recipe
- Fix crash opening ponder from screens with an opened recipe book
2021-04-03 18:33:48 +02:00
simibubi
747849d52e
Merge branch 'mc1.16/dev' of https://github.com/Creators-of-Create/Create into mc1.16/dev
2021-04-03 17:55:08 +02:00
simibubi
72789caa01
0/10 not ported
...
- Fixed text wrapping on ponder text elements
2021-04-03 17:55:06 +02:00
Sarim Khan
463854a2c0
allow smart chute to transfer whole stacks
2021-04-03 21:53:39 +06:00
JozsefA
75f2516408
Hopefully fix ServerWorld class cast exception
...
- Avoid changing Entity.world, maintain contraption related state in the mixin.
- Add a mixin to playSound to shift the position of the sound.
2021-04-03 00:42:21 -07:00
zelophed
809bc6bf88
merge and port
2021-04-03 01:16:14 +02:00
zelophed
e05eb5c386
Merge branch 'mc1.15/dev' into mc1.16/dev
...
# Conflicts:
# src/main/java/com/simibubi/create/foundation/config/CClient.java
# src/main/java/com/simibubi/create/foundation/utility/placement/PlacementHelpers.java
2021-04-03 01:00:57 +02:00
zelophed
7a6b1c6949
0.3.1 hotfixes, part I
2021-04-03 00:54:28 +02:00
JozsefA
5abc1e0fe7
Instanced pulleys first pass
2021-04-02 13:38:28 -07:00
simibubi
ab147722d5
Update ja_jp.json
2021-04-02 22:27:44 +02:00
simibubi
c7a3464151
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-04-02 22:27:37 +02:00
zelophed
19862d4341
Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev
2021-04-02 22:15:11 +02:00
zelophed
2b00602446
append, not add
2021-04-02 22:14:40 +02:00
simibubi
f17a804f43
post-PR datagen
2021-04-02 21:09:40 +02:00
simibubi
7193b5b0c2
Merge pull request #1149 from RakuGaki-MC/mc1.16/dev
...
[mc1.16/dev] Update ja_jp.json
2021-04-02 21:00:07 +02:00
simibubi
c5f3d4413d
Merge pull request #1322 from Peatral/mc1.15/dev
...
Update de_de.json
2021-04-02 20:58:29 +02:00
simibubi
b1bec1a1f9
Fix-ups
...
- Filterless Creative Crates now serve as universal supply to schematic-driven deployers
- An attempt to force-update ejectors to not miss out on lid animations
- Fixed schematic-driven deployers not copying safe nbt data
2021-04-02 19:22:41 +02:00
simibubi
c82896998c
Merge pull request #1216 from mrh0/mc1.15/dev
...
Improved modding support
2021-04-02 18:56:20 +02:00
Christof
1d31271bcb
Update de_de.json
...
Typos and Gabelstein = Gabbro
2021-04-02 18:23:11 +02:00
Christof
8dbfd4877e
Update de_de.json
...
Added the translations for a lot of blocks and a few advancements
2021-04-02 18:07:53 +02:00
simibubi
6cfbf26f49
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-04-01 17:46:07 +02:00
simibubi
6c942be7f5
Too slippery
...
- Sliding on contraptions now takes its slope into account
- Gantry Carriages are now less prone to break when moved near other blocks
2021-04-01 17:43:39 +02:00
JozsefA
4b00562daf
Port to 1.16
2021-03-31 21:44:16 -07:00
JozsefA
4908fc1b96
Change some obfuscated variable names
2021-03-31 21:29:17 -07:00
JozsefA
78fbb52ddc
Merge remote-tracking branch 'origin/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/curiosities/TreeFertilizerItem.java
2021-03-31 21:17:01 -07:00
JozsefA
c21a8bcbde
Fix startup crash on some AMD drivers.
...
- The fix comes from Grondag's work on canvas.
- Original commit: 820bf75409
2021-03-31 20:53:02 -07:00
JozsefA
6ef88c3bd8
Fix some issues with instance rate limiting
2021-03-31 16:25:59 -07:00
JozsefA
b9f6a3b94e
Instanced bearings
2021-03-31 16:19:58 -07:00
JozsefA
b743e00978
Better lazy arm instances
2021-03-31 16:18:53 -07:00
grimmauld
240510e3ee
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
2021-03-31 21:18:43 +02:00
grimmauld
3cc8291b72
Simpler bouncing? Thanks @K1521
2021-03-31 21:18:33 +02:00
Snownee
c02193233b
Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev
2021-04-01 01:46:52 +08:00
Snownee
ba63cc3e7f
Fix tree fertilizer spreading podzol. Backport a440ab6
2021-04-01 01:43:06 +08:00
simibubi
b6857c2a20
Danger Polish
...
- Fixed Crash when Deployer attempts to use Sand Paper
2021-03-31 15:27:57 +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
simibubi
2b4ef88fc1
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-03-31 14:50:16 +02:00
simibubi
d61e387916
The least performant option
...
- Fixed slow merging of collision shapes
- Improved async handling of the collision shape merger
- BBs far away from an entity now get skipped in the collision cycle
2021-03-31 14:27:27 +02:00
JozsefA
65d21c374b
Fix crash making step sounds on servers.
2021-03-30 18:50:07 -07:00
simibubi
0bb18db4b6
Oriented bouncing and sliding
...
- Slime blocks on a moving Contraption are now bouncy
- Ice blocks on moving Contraptions are now very slippery
2021-03-31 03:16:29 +02:00
JozsefA
376c4e1cb0
Fix crash rendering mechanical crafters on contraptions.
2021-03-30 15:08:42 -07:00
JozsefA
c905aa5e2e
Merge branch 'mc1.15/dev' into mc1.16/dev
...
# Conflicts:
# src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlyWheelInstance.java
# src/main/java/com/simibubi/create/content/contraptions/components/mixer/MixerInstance.java
# src/main/java/com/simibubi/create/content/contraptions/components/press/PressInstance.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerInstance.java
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionKineticRenderer.java
# src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeInstance.java
# src/main/java/com/simibubi/create/content/logistics/block/FlapData.java
# src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInstance.java
2021-03-30 14:58:08 -07:00
JozsefA
4ec25798a5
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
2021-03-30 14:17:16 -07:00
JozsefA
a2b9dfc28a
Change the locks
...
- InstanceKey is no more.
- InstanceData and co. keep track of removals and updates.
- InstancedModel's buffer management is much more sane now.
- Re-add mixin to #tickBlockEntities and ensure compat with Performant.
- Move ...backend.instancing.impl to backend.core
2021-03-30 14:14:58 -07:00
simibubi
8a4eaef015
Fix tooltip whitespace
2021-03-30 18:56:22 +02:00
simibubi
9fa63743b6
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-03-30 18:49:13 +02:00
simibubi
ae340ccac0
Spooky ghost honey
...
- Fixed pipes drawing non-source honey from beehives
- Fixed deployers duplicating glass bottles
2021-03-30 18:48:57 +02:00
simibubi
dba1ff9c34
Port new Changes
2021-03-30 18:34:55 +02:00
simibubi
37c3625d4a
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-03-30 18:34:40 +02:00
simibubi
3a6714fb08
Handy Tweaks
...
- Deployers now place block drops into their internal inventory
- Deployers can now harvest honey or honeycombs from beehives
- Pipes can now connect to and drain liquid honey from beehives
2021-03-30 18:10:24 +02:00
simibubi
389b2e0e90
Ponder fix-ups
...
- Input window elements no longer use integer coordinates
- Comfy reading is now a config option and persists across ponder UIs
- Disabled editor mode
2021-03-30 16:57:21 +02:00
simibubi
c2f3ebbf72
Fix Tooltips on 1.16
2021-03-30 16:32:19 +02:00
JozsefA
ff4a9e5c78
Fix arms glitching out on contraptions.
...
- Also provide a hook for subclasses of InstancedTileRenderer to control when specific instances tick.
2021-03-29 15:06:09 -07:00
grimmauld
358ff25031
Fix 1.16 too, i guess
2021-03-29 23:25:28 +02:00
zelophed
0b6098817e
fix some wrench rotation issues
2021-03-29 20:31:08 +02:00
grimmauld
dadde271e4
Fix even more critical crashes, now on schematics
2021-03-29 18:19:17 +02:00
grimmauld
69f4c9f8ad
Fix WrappedWorld.getLightingProvider being null and crashing
2021-03-29 17:19:18 +02:00
grimmauld
90b9a3aff9
Merge & Port
2021-03-29 10:57:50 +02:00
simibubi
5299204fb5
Better Tooltip Integration
...
- Removed overlapping tooltips
- Adjusted tooltip presentation for more visual consistency
2021-03-28 20:56:55 +02:00
simibubi
bf2a506bb8
A final thought
...
- Fixed non-splitting modes on brass tunnels
- Ponder scenes for ejectors and tunnels
2021-03-28 18:57:50 +02:00
grimmauld
caa3c57b71
Merge & Port
2021-03-28 10:58:25 +02:00
zelophed
683d18b994
tick off some todos
2021-03-28 04:19:58 +02:00
Kryppers
7de922f239
Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev
2021-03-28 02:13:57 +01:00
Kryppers
1888f2d79b
Update weighted_ejector_casing.png
2021-03-28 02:13:53 +01:00
simibubi
76bd3b3f50
Pondering too fast
...
- Added a button to slow down ponder scenes while any text is shown on screen
2021-03-28 01:52:04 +01:00
simibubi
fcae7e5c9a
Motion commotion
...
- Update recipe for redstone contact
- Counteracted ejector inaccuracies caused by deferred activation
- Rewired ponder vertex sorting to evade Optifine incompatibilities
2021-03-28 00:45:14 +01:00
JozsefA
d28e60a059
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
2021-03-27 16:38:36 -07:00
JozsefA
4e7777a130
Fix more instancing nonsense.
...
OrientedData was still applying the origin position shift, so some
things (mechanical presses) wouldn't appear in the right spot.
2021-03-27 16:35:47 -07:00
grimmauld
1739e72af0
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
2021-03-28 00:21:13 +01:00
grimmauld
1bffb82ae4
Cogwheel refactor Part III
...
- Removed the calls to the AllBlocks entries where necessary
- Made placement helpers call the same code as CogWheelBlock.isValidPosition
2021-03-28 00:19:27 +01:00
JozsefA
5f49698a94
Fix mixer weirdness.
...
- Mixer and Press instances now use the quaternion shader.
2021-03-27 15:06:56 -07:00
grimmauld
7b022cd302
Cogwheel refactor Part II
...
- Refactored getStateForPlacement to reduce doubled code
2021-03-27 23:05:59 +01:00
grimmauld
4ff20b4217
Cogwheel refactor Part I
...
- Moved hasIntegratedCogWheel and isSmallCog to ICogWheel
2021-03-27 22:42:27 +01:00
Kryppers
213711ce77
Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev
2021-03-27 21:09:19 +00:00
Kryppers
c239cec8b4
Update weighted_ejector_top.png
2021-03-27 21:09:17 +00:00
simibubi
3dd199e9d9
Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev
2021-03-27 20:15:13 +01:00
simibubi
497ea4bb66
Foolish not to avoid the lack of counteracting no-clip
...
- Ejectors now occasionally track launched items, scanning for any obstacles in their trajectory
- Fixed rendered items passing an Ejectors' target on clients ticking faster than their server
- Removed outdated warnings for 'transposer funnels'
2021-03-27 20:14:55 +01:00
Kryppers
25bc102e92
New contact, who dis?
...
updated redstone contact textures.
2021-03-27 19:13:26 +00:00
grimmauld
6e0e3d28fd
Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev
2021-03-27 19:15:57 +01:00
grimmauld
bec6b1d414
Try to make terraforged less angry against Create world gen
2021-03-27 19:15:52 +01:00
zelophed
a5a9ea1b7f
ponder particles, pog
2021-03-27 16:33:23 +01:00
zelophed
c9ba76a2d1
Assisted Placement, Part IV-c
...
- indicator renders again
- changed the config to allow the indicator to be disabled altogether
2021-03-27 16:01:05 +01:00
JozsefA
fd98bd4976
Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev
2021-03-27 01:10:42 -07:00
JozsefA
a7d714f8ba
Fix for ponder particles yeeting Flywheel rendering.
...
I need to isolate the world load/unload stuff for
Flywheel anyway, a more robust solution is needed.
2021-03-27 01:10:01 -07:00
grimmauld
5dad567766
Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev
2021-03-27 08:32:32 +01:00
grimmauld
9bc25db615
Keep everything up to date
2021-03-27 08:32:23 +01:00
JozsefA
4675e0ad15
Stop relying on IDynamicInstance#beginFrame to setup instance state.
...
- Gantry carriages no longer update when not necessary.
2021-03-26 22:59:47 -07:00
JozsefA
d3d338e64b
STE tick optimization.
...
- SmartTileEntity#tick down to 3.32% from 11.64% cpu time.
- Measured by JFR over 2 sessions each >8min.
- Test world was the deployer fields.
- Iterating over HashMap values is slow.
- Collect TileEntityBehaviours into a list when the contents of SmartTileEntity#behaviours changes.
2021-03-26 22:02:19 -07:00
JozsefA
cf5eea5a10
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
2021-03-26 17:31:41 -07:00
JozsefA
0b25f662dc
Frame rate and tick rate limiting with distance.
...
- Significant performance improvement when dealing with massive amounts of dynamic instances, otherwise marginal.
2021-03-26 16:47:37 -07:00
zelophed
7230489b19
placement helper oversight
...
- shout-out to d'arcy :P
2021-03-27 00:41:09 +01:00
zelophed
56b1170224
Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev
...
# Conflicts:
# src/main/java/com/simibubi/create/foundation/ponder/content/PonderTagScreen.java
2021-03-26 23:59:19 +01:00
zelophed
687743d18f
ponder polish
...
- some more changes to z-levels in ponder screens
- should be equal to 1.15 ponder now, except for the particles
2021-03-26 23:57:53 +01:00
grimmauld
24c306df90
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-03-26 23:26:22 +01:00
JozsefA
e91a15cf5f
Ejectors wind up again.
2021-03-26 15:25:42 -07:00
grimmauld
60bc6102e2
Add Create stone to base_stone_overworld block tag (terraforged was complaining)
2021-03-26 23:21:44 +01:00
grimmauld
fe10c258c4
Merge & Port
2021-03-26 23:13:49 +01:00
grimmauld
5a176204a5
Merge & Port
2021-03-26 22:17:23 +01:00
simibubi
cb759e793e
3D Printing is cool again
...
- Fixed Schematicannon clearing blocks outside of a Schematics' bounding box
- Safety check for onBlockPlacedBy with null player
- Deployers with a positioned Schematic as their filter will place blocks accordingly, taking items from the contraption inventory
2021-03-26 22:05:16 +01:00
simibubi
0afb29f9a6
Simulate and Translocate
...
- Adjusted Brass Tunnels once again to better deal with non-complete item transferrals
- Brass tunnels now always output to their sides first
- Thrown chromatic products are now gravity-less
- Sneaking on Ejectors bypasses them triggering
- Fixed ponder tag item listing
- Ejectors now trigger observers
- Fixed negative bottom pull distance in chutes
- Fixed smart chutes deleting non-stackable items
- Fixed chutes not able to output partial stacks
- Ejectors can now be paused with redstone
- Deferred ejector launches by one tick to 'unground' entities more consistently
2021-03-26 18:41:03 +01:00
grimmauld
f28a3e87f3
No longer keep making new wrappers (but particles still don't work)
2021-03-26 16:50:06 +01:00
grimmauld
1675ee25b4
Fix ponder text being shy and hiding behind other things
2021-03-26 16:27:57 +01:00
grimmauld
35c62360be
Merge & Port
2021-03-26 16:03:09 +01:00
grimmauld
9c8d035694
Dya see the dye?
2021-03-26 13:35:45 +01:00
grimmauld
b582b39ae4
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
2021-03-26 09:11:48 +01:00
grimmauld
5fa8a0b808
Revert "Fix leave finding in saws so compatibility with other mods works"
...
This is necessary to make the distance gathering work. Sorry me dumb dumb
2021-03-26 09:11:25 +01:00
JozsefA
1d2b51250c
Instanced Ejectors and better hashing for BehaviourTypes.
2021-03-25 21:27:08 -07:00
simibubi
718142e26f
Faith in your Depot
...
- Added Weighted Ejectors
- Fixed? some tunnel distribution inconsistencies
2021-03-26 00:15:38 +01:00
JozsefA
2e5d7a734f
Fix ConcurrentModificationException preparing frame for rendering.
2021-03-25 15:10:40 -07:00
JozsefA
affb8abfbd
Potentially fix weird crash.
2021-03-25 14:48:42 -07:00
JozsefA
a56514c308
Some housekeeping and documentation.
2021-03-25 14:29:52 -07:00
zelophed
8c79174904
fix pressing recipe inconsistency ( closes #1296 )
2021-03-25 03:58:24 +01:00
zelophed
e26191aaf7
GuiGameReposition
...
- adjust the position of the item renderer for gui elements
- include a warning when joining a world while fabulous graphics are enabled
2021-03-25 02:27:10 +01:00
JozsefA
b18993ed26
Little things.
...
- Quark magnets don't crash (already fixed).
- Fix quark magnet leaving behind ghost instances.
- Fix crash with belt lighting after being placed by contraptions.
- Simplify tile add/remove mixins and avoid conflict with Performant.
- Avoid FloatBuffer detour when uploading matrix uniforms.
- InstancedTileRenderer no longer has to clean up.
- Properly let go of tickable instances.
2021-03-24 15:48:15 -07:00
grimmauld
73f87ab44e
Exotic smoking
...
- all blocks tagged as campfires that have the lit blockstate property set to true are now valid smoke sources
2021-03-24 23:42:42 +01:00
grimmauld
bb18d9bf71
runData
2021-03-24 15:11:51 +01:00
grimmauld
4d22b5e9b4
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-03-24 15:07:51 +01:00
grimmauld
7eafbe5757
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
2021-03-24 15:07:04 +01:00
grimmauld
16586747a6
Increase priority, less crashing with performant
2021-03-24 15:06:54 +01:00
grimmauld
cbbf502003
port recent changes
2021-03-24 14:54:24 +01:00
JozsefA
1233ecfe80
Fix belt lighting issues, again.
2021-03-23 14:13:32 -07:00
JozsefA
5eae3a53fc
Keeps getting hotter.
...
- Belts now use the new system.
- Remove ILightListener.java.
- Listeners can choose to remove themselves.
- Rename some static GridAlignedBB methods.
2021-03-23 02:12:09 -07:00
JozsefA
20189a86fc
Spicy light update listening api.
...
- Round 1, no profiling done yet, not everything uses it.
- WeakHashSet could be useful elsewhere, too.
2021-03-23 00:08:31 -07:00
JozsefA
1310b88828
Lieutenant Scatterbrain II.
...
- Swich to tabs. (not everything is tabs yet)
- Refactor light and color attributes to their own Enum.
- Quaternion/pivot/position attribute shader.
- Always update an instance when the WorldRenderer checks if it should rerender a block.
- Simplify some names.
- Remove generics in InstanceData classes.
- Deployer Tiles now use the oriented material.
- Press heads now correctly orient themselves.
- ModelData buffers things faster and is simpler.
2021-03-22 20:20:52 -07:00
simibubi
f7f7b67a7d
Thinking Arms
...
- Ponder Scenes for the Mechanical Arm
- Fixed empty basins showing a fluid container tooltip
2021-03-22 02:05:47 +01:00
simibubi
140cd9a85a
Sailing craft
...
- Front face of crafters now supports hoppers and co
- Scenes for Sails and Mechanical Crafters
- Fixed a couple strange quirks of Ponder text windows
2021-03-21 17:38:33 +01:00
grimmauld
c75a0f8aa7
Particular immersion
2021-03-21 17:16:17 +01:00
JozsefA
9a493b7977
Sticker fixer.
2021-03-20 23:35:13 -07:00
JozsefA
6a0ad77fe7
Refactor away TileEntityInstance#init
...
- Move it to the constructor.
- An instance is now discarded and recreated if TileEntityInstance#shouldReset return true.
- Mark a bunch of stuff final.
2021-03-20 22:33:24 -07:00
simibubi
a356f8a91a
Ponder and Polish
...
- Ponder scenes for depot, chute and smart chute
- Fixed saws and drains ejecting items when mounted funnel is backstuffed
- Fixed extracting funnels allowing items to be inserted by arms and belt input
- Vanilla items in ponder tags are marked purple instead of red
- Vertical funnels now block chutes
- Large cogs can no longer be placed right next to crafters or millstones
- Mechanical Arms now stall targeted belt items
2021-03-21 03:51:22 +01:00
JozsefA
f6cfd377a7
Ticking things.
...
- Differentiate tickable and dynamic instances.
- Instanced repeaters.
2021-03-20 16:30:09 -07:00
grimmauld
9df9a99185
We have SPONGE!
...
(and not only for mixins...)
2021-03-20 22:49:42 +01:00
JozsefA
3d0898c59b
Smooth harvesters, step sounds v1.
2021-03-20 13:16:20 -07:00
grimmauld
7199068189
Fix some stuff, break othter stuff
...
- Ponder Scenes have misplaced icons
- placement helper arrows don't render
- Particles in ponders *should* work
-> added WrappedClientWorld to make that work
- fixed ponder crashingon 1.16
- moved gui stuff to matrix stacks
- remove BlockHalper#hasBlockStateProperty, as BlockState#contains is a thing
- ran runData
2021-03-20 17:33:35 +01: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
simibubi
c0de8c4eb6
The grind continues
...
- Scenes for Millstone, Crushing wheels, blaze burners, basin, mixer, press, speedometer and stressometer
2021-03-19 20:05:55 +01:00
JozsefA
cef93ab0a8
Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev
2021-03-18 14:37:03 -07:00
JozsefA
b7ec884b9c
Includes, quaternions, and frames.
...
- Shaders can now reference other files with #flwinclude <"...">.
- Shaders are now located in assets/flywheel/shaders.
- Include paths are namespaced (a la ResourceLocation) and relative to the flywheel shaders root folder.
- Optimized glsl rotations using quaternions (when applicable) and vectorized matrix construction.
- Vectorize diffuse lighting calculations.
- Micro optimization in SmartTileEntity.java
2021-03-18 14:36:37 -07:00
Snownee
7954aed0fd
Disassemble contraption when bearing block being rotated by wrench
2021-03-18 23:26:15 +08:00
Snownee
3b36526443
Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev
2021-03-18 18:49:43 +08:00
Snownee
d75793d036
Add extra item capability checks
...
Many mods does not invalidate their capabilities, so fix it on our end
2021-03-18 18:43:25 +08:00
simibubi
f7f51d1988
Ponder on Tracks
...
- Ponder scenes for the Cart Assembler
2021-03-17 23:31:30 +01:00
simibubi
cddc4a40f5
Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev
2021-03-17 01:23:18 +01:00
simibubi
1d3e057dda
Last kinetic relays and generators
...
- Fixed transparency depth sorting inside ponder UI
- Scenes for Seq. Gearshift, Furnace Engine/Flywheel and Rotation Speed Controllers
2021-03-17 01:23:16 +01:00
JozsefA
20da7c7761
Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev
2021-03-16 15:52:45 -07: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
a897b5e78b
Scene machine
...
- Fix funnels not rendering filter slot items
- Ponder scenes for the Deployer, Harvester and Plough
- Fixed uvs on Deployer model
- Ploughs can now harvest snow layers
2021-03-16 21:04:42 +01:00
zelophed
13a4d0ca62
funnel extraction
...
- allow funnels to extract items when part of a contraption
- also include a little animation for the new backtrack button
2021-03-16 17:21:32 +01:00
Snownee
e3394a8907
Allow attribute filter screen to have space to show JEI bookmarks
2021-03-16 21:56:04 +08:00
Snownee
ddb5aa9a3d
Human friendly schematic selection
2021-03-16 15:38:20 +08:00
Snownee
8b5d5abc06
Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev
2021-03-16 12:32:31 +08:00
simibubi
27eaf55b45
Another UI reshuffle
...
- 'Backstepping' is now a button
- Added little labels for hovered buttons at the bottom
- Moved ponder/transition-specific logic out of the generic screen class
2021-03-16 03:24:34 +01:00
JozsefA
9a545a09a4
Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev
2021-03-15 15:58:51 -07:00
JozsefA
e1c16d869d
Some semblance of immersive portals compat.
...
- Each world gets its own KineticRenderer now.
2021-03-15 15:58:41 -07:00
simibubi
e38d85a633
Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev
2021-03-15 23:20:26 +01:00
simibubi
d9027c1d99
Logic Thinking
...
- Ponder scenes for various redstone components
2021-03-15 23:20:24 +01:00
JozsefA
52eed2bab3
Instanced Gauges and Valves, DRY lighting.
2021-03-15 14:20:13 -07:00
Snownee
a534d2230c
Implement extra area for schematic table
2021-03-16 00:28:45 +08:00
Snownee
8281c5746a
Fix ponder particles weirdness
2021-03-15 17:00:42 +08:00
Snownee
411925033e
Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev
2021-03-15 13:02:05 +08:00
Snownee
0ca388141c
Better line breaking
2021-03-15 13:00:55 +08:00
simibubi
f1b940ea18
Cutting imaginary trees
...
- Fixed TEs not ticking properly when wrap-around-skipping to a keyframe
- Added a block restoration instruction
- Scenes for the Saw
- runData catching up
2021-03-15 05:49:29 +01:00
simibubi
2bf9672d92
hotfix
...
- Oops. That didn't compile
2021-03-14 23:26:05 +01:00
simibubi
dac1cf0303
Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev
2021-03-14 21:12:04 +01:00
simibubi
a8dc4f3622
Broken Breaking
...
- Painful implementation of virtual block breaking overlay
- Scenes for the Mechanical Drill
2021-03-14 21:12:02 +01:00
JozsefA
b71c831a07
Lieutenant Scatterbrain.
...
- User no longer has to manually add instances, new hook instead.
- Use registrate for InstanceFactories.
- Instanced levers.
- Instanced hand cranks.
- Reorganize PhysicalFloat and LerpedFloat.
2021-03-13 20:45:24 -08:00
simibubi
a40d0f58c2
Pondering about sticky stuff
...
- Scenes for chassis, super glue, stickers and redstone contact
- Added a warning when players try to use experimental rendering while shaders are active
2021-03-13 18:24:10 +01:00
JozsefA
d735d237ec
Ghost blocks are less spooky.
2021-03-12 20:20:14 -08:00
JozsefA
a1e10a5c3c
Belt speed = item speed and secret wrench fix.
2021-03-12 16:33:01 -08:00
JozsefA
f14661fb6f
Pondering: the beginning and the end.
...
- Special-case seeking to the end of a ponder scene.
- Draw indicators for seeking to the beginning and end.
- Fix pulleys not rendering correctly.
2021-03-12 14:03:21 -08:00
simibubi
841bba04bd
Pondering too quickly
...
- Fixed idle instruction only idling for t-1
- Made keyframe skipping a little easier
- Added option to register keyframes as part of a text window builder
- PonderUI now stalls the scene briefly after skips
2021-03-12 20:42:37 +01:00
simibubi
678ddfa764
Spoutput blockage
...
- Fixed basin auto-output not working on stopped belts
- Basin auto-output can now share a space with funnels
- Linear chassis no longer allow sticky sides facing a directly attached linear chassis of the same type
2021-03-12 18:44:05 +01:00
Snownee
af9ed3e44b
Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev
2021-03-12 23:51:20 +08:00
Snownee
6baa519973
Fix cart assembler duplication ( closes #1058 , #1150 )
2021-03-12 23:46:26 +08:00
zelophed
438ac99b2d
fix dist issues for dedicated server
2021-03-12 15:51:25 +01:00
zelophed
51c919e4d8
too much assist
...
- add a configurable range to placement helpers i.e. the pole helper specifically
2021-03-12 03:47:36 +01:00
JozsefA
154000290e
Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev
...
# Conflicts:
# src/main/java/com/simibubi/create/foundation/ponder/PonderScene.java
# src/main/java/com/simibubi/create/foundation/ponder/PonderUI.java
2021-03-11 16:34:46 -08:00
JozsefA
f9eb4dd2e7
Pondering back and forth.
...
- Only about gantries so far.
- Reduce Backend log spam.
2021-03-11 15:59:26 -08:00
Kryppers
5e5289fcb0
Update secondary_linear_chassis_side_connected.png
2021-03-11 23:50:58 +00:00
grimmauld
f115233197
Fix leave finding in saws so compatibility with other mods works
2021-03-11 20:31:23 +01:00
simibubi
2a8c3debeb
Captain Distracto, Part II
...
- Linear Chassis now connect to each other in any direction
2021-03-11 19:51:58 +01:00
grimmauld
d38f49fab6
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
2021-03-11 18:39:22 +01:00
grimmauld
59303fea2f
Extend /create ponder command functionality
2021-03-11 18:39:12 +01:00
zelophed
0448d3f6f3
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
2021-03-11 15:29:40 +01:00
zelophed
60dbb931c1
double stick
...
- prevent super glue from being placed on already sticky faces
2021-03-11 15:27:17 +01:00
simibubi
4445872959
Stop hacking the base plate size
...
- Added proper scene scale/alignment instructions
2021-03-11 13:48:31 +01:00
zelophed
7eb0b95ab9
easier crank interaction
...
- allow some blocks to be used while sneaking and holding an item
2021-03-11 12:55:44 +01:00
simibubi
d1e96c3b4b
Timewarp
...
- Added user view mode for editors to hide coordinates
- Ponder now pauses the game in SP
- Ponder elements now use a separate timer and separate partial ticks
- Fixed virtual funnels not flapping
- Fixed ponder buttons having hover highlights when not clickable
- Fixed ponder button mouse hitbox
- Addressed strange render state bleed with identify mode highlighting
2021-03-11 11:35:34 +01:00
JozsefA
ea90196250
Clocks are lit.
...
- ClockworkContraptions and BearingContraptions now both use the same lighter type.
2021-03-11 01:17:01 -08:00
simibubi
c73e3166cb
Contraption Ponder Push
...
- Scenes for Pulley, Piston, and Clockwork Bearing
2021-03-11 03:32:18 +01:00
JozsefA
c54d80a161
Better bounding boxes for bearings.
...
- Fix bug causing entities to slip off the far corners of bearing contraptions.
- This was already implemented for BearingLighter.java, now it's promoted to Contraption.java.
- Promote anonymous WrappedWorld in Contraption.java to inner class.
2021-03-10 17:08:20 -08:00
JozsefA
b7f0fe9b10
Oops engine stuff is okay again.
2021-03-10 16:09:17 -08:00
JozsefA
d0a6f4123b
Instanced flywheels, engines, and schematicannons.
2021-03-10 13:44:04 -08:00
simibubi
d8ab00b66e
Pondering about Mechanical Bearings
2021-03-10 19:18:25 +01:00
JozsefA
2ddf57cd76
Instanced mixers and presses.
2021-03-09 15:46:15 -08:00
JozsefA
dcea504184
Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev
2021-03-09 14:23:40 -08:00
JozsefA
95eabe9cf9
Instanced arms.
2021-03-09 14:22:20 -08:00
simibubi
cb063d161c
Pondering about Windmills
2021-03-09 21:17:02 +01:00
simibubi
6b999fa7d4
Tag hopping
...
- Ponder UIs opened from a tag screen now skip to the first scene with a matching tag if available
2021-03-09 17:32:01 +01:00
simibubi
d252a204ef
Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev
2021-03-09 04:24:48 +01:00
simibubi
d61b840c5c
Back to fighting Minecarts
...
- Fixed Minecart Contraptions started on a powered rail facing in unwanted directions
- Fixed powered rail Cart Assemblers not respecting the solid block rule of powered rails
- Fixed Minecart contraption items not facing away from the player when placed
- Polished every last bit of the belt uvs
2021-03-09 04:24:45 +01:00
zelophed
a91360a7b9
changing format
...
- goggle overlays now use a localized number format
- minor changes to the layout of the ponder index screen
2021-03-09 03:45:05 +01:00
simibubi
62c3ae4040
Captain Distracto
...
- Removed processing recipes from recipe book
- Reorganized items in creative tab
- Tweaked a few model transforms
- Fixed belt uvs
- ponder birbs can now face the cursor
- fix interpolation on ponder birbs
- Fixed log spam when assembling certain blocks (Points of interest) in a contraption
- Fixed content observers not triggering for in-line belt funnels
2021-03-09 01:49:49 +01:00
JozsefA
33d718d653
Check if worlds support the flywheel backend.
2021-03-08 15:24:58 -08:00
JozsefA
2b37842259
Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev
2021-03-08 14:04:25 -08:00
simibubi
6c8fe67fd4
Gradle Mondays
...
- Replaced ponderworld particle AT with reflection
- Symmetry Wand now checks for placement permissions
- Lang now uses Locale.ROOT
- Fixed crash using ponder without advanced tooltips enabled
2021-03-08 22:12:25 +01:00
JozsefA
e943705fb7
Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev
...
# Conflicts:
# src/main/java/com/simibubi/create/AllTileEntities.java
# src/main/resources/META-INF/accesstransformer.cfg
2021-03-08 11:06:35 -08:00
simibubi
bea60ccb86
Fix build issues
2021-03-08 17:42:50 +01:00
simibubi
21d87a0cfe
Change mixin repo
2021-03-08 17:29:42 +01:00
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
5567e57265
Post-PR datagen
2021-03-03 16:34:10 +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
simibubi
2b1c17cb48
Merge pull request #1133 from FrannDzs/patch-2
...
Update es_es.json (HOTFIX)
2021-03-03 16:23:01 +01:00
simibubi
20d8e1d915
Merge pull request #1130 from Alepod/patch-2
...
Update ru_ru.json
2021-03-03 16:22:02 +01:00
simibubi
fe6d9136fc
Merge pull request #1129 from Alepod/patch-1
...
Update ru_ru.json
2021-03-03 16:21:27 +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
23d7d65bb2
...Right, language datagen is a thing
...
- Actually put the lang stuff in the right files, and generate the other localization files...
2021-02-27 17:24:49 +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