Commit Graph

1793 Commits

Author SHA1 Message Date
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
TUsama
a03daa1aed sync to latest version 2021-01-25 13:04:02 +08:00
TUsama
0f3c8fe699 update CHS translation
Co-Authored-By: MacrousHyucen <69157544+MacrousHyucen@users.noreply.github.com>
2021-01-25 12:40:52 +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
Jozsef
4cbea0f9c9 intel graphics now like the shaders 2021-01-23 15:32:17 -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
simibubi
667f27d9b7 Update build.gradle
- Oops, messed with the buildscript again
2021-01-22 20:57:48 +01:00
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
Matteo Merler
7a1817d54d
Update purpur_scope.json 2021-01-22 13:37:30 +01:00
Matteo Merler
bb2d2bbdd9
Update gold_scope.json 2021-01-22 13:37:02 +01:00
Matteo Merler
c75b2e95e7
Update gold_retriever.json 2021-01-22 13:36:42 +01:00
Matteo Merler
6d6ad4f6a4
Update gold_body.json 2021-01-22 13:36:24 +01:00
Matteo Merler
6ab935b85b
Update gold_amplifier.json 2021-01-22 13:36:04 +01:00
Matteo Merler
82fc4637d2
Update gold_accelerator.json 2021-01-22 13:35:41 +01: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
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
Bobert
32d240f91d Uhh, didn't know it would do that 😅
Un-removed RYS compat, apperently that breaks things
2021-01-16 13:10:08 -07:00
Bobert
1622d71929 The Nerf
Nerfs Arid Sand splashing, shouldn't hurt pogression anymore.
Removes RYS recipes, that mod is being rebuilt and reworked, I will submit new recipes when the new version is released for 1.16
2021-01-16 13:00:58 -07:00
JozsefA
0cb18c532d uncomment the mixin annotation processor whoops 2021-01-15 20:07:04 -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
Chubz
645d28ac31
Small fix for an incorrectly translated line
Everyone makes mistakes, right?
2021-01-15 21:24:33 +04:00