Commit Graph

1290 Commits

Author SHA1 Message Date
JozsefA
15302495f5 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/experimental-rendering-merge
# Conflicts:
#	src/main/java/com/simibubi/create/AllEntityTypes.java
#	src/main/java/com/simibubi/create/AllSpriteShifts.java
#	src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntityRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntity.java
#	src/main/java/com/simibubi/create/foundation/command/AllCommands.java
#	src/main/java/com/simibubi/create/foundation/utility/outliner/Outliner.java
2021-02-15 21:27:08 -08:00
Zelophed
b9d1a586c1 Assisted Placement, Part IV
- added 👻-blocks as a placement preview
2021-02-16 00:48:13 +01:00
JozsefA
1e95fe4c7b avoid floating point accuracy errors at high coordinate values.
refactor contraption model translation to be a method in AbstractContraptionEntity.
 - this simplifies the setup required for the fast rendering.
2021-02-14 23:09:17 -08:00
Snownee
5e14ca71d9 Add max stack size check to ItemHelper.extract 2021-02-14 11:51:31 +08:00
Snownee
676a05ad07 Fix rose quartz duplication glitch (#1104) 2021-02-14 11:18:38 +08:00
JozsefA
11616a0b16 avoid 'glGet's at all costs 2021-02-13 16:26:34 -08:00
JozsefA
951a0c4769 contraption actors take into account self lighting 2021-02-13 13:10:14 -08:00
JozsefA
0ad6db4bf7 cache KTEs' renderBoundingBox 2021-02-12 23:06:41 -08:00
Snownee
2d2c7e653f Avoid unnecessary piston contraption assembling 2021-02-13 14:14:28 +08:00
JozsefA
b1905ddfd4 probably fix issue with phosphor crashing contraptions 2021-02-12 21:11:35 -08:00
Snownee
dae651c046 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2021-02-13 13:06:11 +08:00
JozsefA
e88dd89262 whoops null pointer is no more 2021-02-12 19:33:13 -08:00
JozsefA
485a0d2f95 hotswapping is more sane now. 2021-02-12 17:30:21 -08:00
JozsefA
a5f3d799d1 kinda separate system capability stuff, should probably clean this up more.
fix lighting glitches on world load.
2021-02-12 16:36:20 -08:00
simibubi
8ab27904db More Instructions 2021-02-12 17:08:48 +01:00
JozsefA
d824304f12 tile entities on contraptions account for self lighting 2021-02-12 00:13:39 -08:00
JozsefA
a8053ce472 these are somewhere else too 2021-02-11 23:41:52 -08:00
JozsefA
31a1fd71ce everything is somewhere else 2021-02-11 23:36:05 -08:00
JozsefA
67408e0dff better vertex attributes.
all shaders are now GL 2.0 compatible!!!
contraption structure rendering is technically 2.0 compatible now, need some better handling for that.
2021-02-11 20:03:24 -08:00
Zelophed
34de9a0319 Player Feedback, Part III 2021-02-12 03:13:19 +01:00
JozsefA
576165e3d6 some attrib stuff 2021-02-11 14:31:50 -08:00
Zelophed
82e922032a Merge branch 'mc1.15/feedback2' into mc1.15/dev
# Conflicts:
#	src/generated/resources/.cache/cache
#	src/generated/resources/assets/create/lang/unfinished/de_de.json
#	src/generated/resources/assets/create/lang/unfinished/fr_fr.json
#	src/generated/resources/assets/create/lang/unfinished/it_it.json
#	src/generated/resources/assets/create/lang/unfinished/ja_jp.json
#	src/generated/resources/assets/create/lang/unfinished/ko_kr.json
#	src/generated/resources/assets/create/lang/unfinished/nl_nl.json
#	src/generated/resources/assets/create/lang/unfinished/pt_br.json
#	src/generated/resources/assets/create/lang/unfinished/ru_ru.json
#	src/generated/resources/assets/create/lang/unfinished/zh_cn.json
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/StabilizedContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyContraption.java
2021-02-11 20:07:38 +01:00
Zelophed
b4c881a6c8 Player Feedback, Part II 2021-02-11 17:47:55 +01:00
muffinbarde
5f6c94939c
Update de_de.json 2021-02-11 17:21:05 +01:00
JozsefA
3820e11954 get it working again 2021-02-11 02:26:30 -08:00
JozsefA
02114b1d9a begin 2.0 compatibility push, probably not going to be ready for the next release 2021-02-10 17:14:03 -08:00
Zelophed
f3fd32edd3 Assisted Placement, Part III
- blocks placed by helpers make sounds again
- helpers now trigger the proper event and can be cancelled
2021-02-11 00:28:47 +01:00
simibubi
fd3d7bd7fd Refined animations, key input 2021-02-10 16:40:30 +01:00
JozsefA
e93562569b world fog works, fluid fog still doesn't.
better dimension changes.
2021-02-09 21:18:05 -08:00
CKenJa
a8b1fe5f90 Localize Fixes 2021-02-10 13:07:41 +09:00
simibubi
e178cab4a8 Multiple scenes per doc 2021-02-10 03:13:33 +01:00
JozsefA
0cb9094913 non experimental contraption rendering is back.
schematic rendering is fixed.
both of these are kinda ugly hacks, and there is definitely some rewriting necessary for when it's time to be more opengl compatible.

maybe fix belt lighting, again.
remove old belt assets.
2021-02-09 16:14:44 -08:00
simibubi
6836bd97f4 First Steps 2021-02-09 22:34:14 +01:00
JozsefA
6736577e1b fix the rainbow debugger 2021-02-08 21:38:45 -08:00
JozsefA
cfff806df4 some micro optimizations.
cache hot getters.
reduce number of calls to getBeltFacing() in BeltRenderer.
preserve floating point accuracy over (insanely) long play times.
rotate some normals and light some quads.
2021-02-08 21:17:25 -08:00
simibubi
4a5479838c Merge branch 'mc1.15/dev' into mc1.15/metadoc 2021-02-08 16:51:52 +01:00
Snownee
607dbbfb90 Fix PSI item dupe 2021-02-08 22:40:55 +08:00
JozsefA
ee9962b27b fix some new rendering issues that popped up after the revert
proper? optifine shader handling. could use more testing
2021-02-07 22:11:29 -08:00
JozsefA
c9ff31b099 hot swappable rendering
kind of detects optifine
still some kinks to work out
2021-02-07 14:15:52 -08:00
Chexet48
05e62ced51
Update it_it.json 2021-02-07 22:51:43 +01:00
simibubi
cb2c56d772 Gantry shaft placement assist 2021-02-07 18:09:08 +01:00
Snownee
16991c2ce8 Fix NPE while deployer on a contraption trying to disassemble self 2021-02-07 15:49:25 +08:00
s0127943
d8054775d5 Removed unnecessary blocksnapshot.restore 2021-02-07 01:03:53 +01:00
s0127943
f3b6a684f9 Added check to see if a user is allowed to place blocks in the given position to counteract issues with FTBChunks 2021-02-07 01:01:48 +01:00
JozsefA
3e6ef34993 restore arm rendering 2021-02-06 14:39:58 -08:00
simibubi
6981848f8a Clean-up
- Fixed smart chutes not filtering properly
- Fixed chutes not treating smart chutes like chutes
- Removed code leftovers
- Removed datagen cache from gitignore
2021-02-06 22:41:20 +01:00
Nick Smit
44a3313c12 Added the 'Paused' instruction for sequenced gearshift, which waits for another redstone pulse to continue. 2021-02-06 21:07:24 +01:00
Chexet48
83df83d4be
Update it_it.json
Added Gantry Pinion and Gantry Shaft, missing in unlocalized entries
2021-02-06 19:09:29 +01:00
simibubi
2315625c4b Quickfix
- Fixed gantry shafts able to cause loops in kinetic connectivity when switching to powered state
2021-02-06 18:11:35 +01:00
Odin
577c0e4912
Update fr_fr.json
666 Unlocalized
2021-02-06 17:34:37 +01:00
simibubi
bed5a1d03a
Merge pull request #965 from Snownee/mc1.15/security-patches
Security patches
2021-02-06 17:20:58 +01:00
simibubi
85110f3ce8
Merge pull request #906 from Snownee/mc1.15/dev
Bug fixes
2021-02-06 16:23:35 +01:00
simibubi
3d8b10d9a7 Gantry improvements
- Fixed gantry shafts not locking to correct orientations when placed near others
- Gantry pinions can now be kickstarted by player interaction
- Gantry pinions now update properly after being moved onto different gantry shafts
- Fixed Encased Fans not providing kinetic power after being moved by contraption
- Sticky Mechanical Pistons now drag attached structures with them
- Mechanical piston heads and poles now drag their entire piston multiblock with them
2021-02-06 16:07:22 +01:00
JozsefA
5ba4477ada restore old tile rendering from 3336778052 2021-02-06 02:26:56 -08:00
JozsefA
90993ce8e1 start working on schematic rendering 2021-02-05 22:48:55 -08:00
3d2edc492b Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-02-05 21:36:10 +01:00
Snownee
25daf28205 Format codes 2021-02-06 04:21:07 +08:00
Snownee
2baa3f9922 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/security-patches 2021-02-06 04:16:26 +08:00
simibubi
ff96e80d81 ru_ru.json
- Integrated changes to russian localization made by #819 on correct branch to the correct file
2021-02-05 20:31:49 +01:00
simibubi
b3ee203701 fr_fr.json
- Reorganize localization file
2021-02-05 20:11:52 +01:00
simibubi
4a357bb729
Merge pull request #1027 from dindin-glitch/patch-2
Translated a bunch of random things
2021-02-05 20:05:42 +01:00
simibubi
16e871feba it_it.json
- Move lang file to correct location
2021-02-05 20:02:39 +01:00
simibubi
df6b92cf19
Merge pull request #985 from dunois2737/mc1.15/dev
Create zh_tw.json
2021-02-05 19:52:19 +01:00
simibubi
58d2171f02
Merge pull request #896 from LWHK/mc1.15/dev
[Localization]update CHS translation
2021-02-05 19:45:47 +01:00
simibubi
f0843f3180
Merge pull request #849 from Merlo17/mc1.15/dev
Updated zapper recipes to use tags
2021-02-05 19:30:03 +01:00
simibubi
a5f5204019 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2021-02-05 19:14:26 +01:00
simibubi
edf654cd4a ja_jp.json
- Integrate changes to japanese localization from #879 in the correct file
2021-02-05 19:14:06 +01:00
simibubi
e42925a365
Merge pull request #758 from Bobisnotap/mc1.15/dev
- Adjusted compat recipe for 'atmospheric'
2021-02-05 19:01:57 +01:00
Odin
ef3d4df944
Translated a bunch of random things 2021-02-05 18:59:58 +01:00
simibubi
2a035a7636
Merge pull request #749 from Chubzik1/patch-1
Small fix for an incorrectly translated line
2021-02-05 18:51:15 +01:00
simibubi
5f2f02dab0
Merge pull request #743 from garyyo/mc1.15/dev
Added missing ae2 compatibility recipe.
2021-02-05 18:50:14 +01:00
simibubi
078d86de66 en_mx.json
- Integrate es_mx.json from #655 on correct branch and path; with unlocalized entries removed
2021-02-05 18:42:08 +01:00
simibubi
d24851157e Integrate recent changes to de_de.json
- Transfer changes made to the template file in #647, #648, #523 to actual lang file
2021-02-05 18:11:18 +01:00
simibubi
66b83c1250 Update Localization Readme.txt 2021-02-05 17:48:41 +01:00
JozsefA
d50e07369b flywheels render with the new tech, and therefore have more accurate lighting 2021-02-04 19:21:25 -08:00
simibubi
72ec08ddfa Asset attack
- Fixed floor-mounted cogbrackets not having a particle texture
- Redesigned clutch, gearshift, seq. gearshift and speed controller with up-to-date palettes
2021-02-04 23:46:59 +01:00
simibubi
374f3c9547 Climb or Convey
- Added Gantry shafts and Gantry pinions
- Further attempts at stabilizing kinetic propagation
- Contraption types can now be added from external code
- Kinetic tile entities now have more control over kinetic propagation rules
- Added backend for loading schematic configurations globally for any component to see
- Encased chain drives are less likely to create a kinetic source loop when wrenched
- Piston and Pulley contraptions are less likely to overshoot targets at high speeds
2021-02-04 21:02:30 +01:00
dunois2737
490c53006f
Add files via upload 2021-02-04 21:41:48 +09:00
JozsefA
456ed364a4 Fix another issue with ghost instances.
Hopefully fix belt lighting issues.
2021-02-04 00:03:37 -08:00
JozsefA
8c0e983f36 An absolutely ridiculous amount of refactoring. Shader system got a complete makeover, but still needs a little work.
Objective was GL compatibility, now runs with 3.3, 2.0 is target.
Remove old tile rendering code. Need to bring back old old (vanilla) tile rendering code.
2021-02-03 23:21:10 -08:00
JozsefA
b766658415 probably fix all issues with ghost instances
instanced tiles on contraptions now self light properly
2021-02-02 13:11:22 -08:00
JozsefA
f319dd5e8d fix #1 finally
start work on shader abstraction
use backend for ebos
fix some issues with ghost instances, more work to be done
2021-02-01 16:16:35 -08:00
Snownee
fc459732fc Fix chute item dupe (#939) 2021-02-01 16:46:36 +08:00
Snownee
d1e9b76a24 Make deployer still activate when it is triggering advancement 2021-01-31 19:54:27 +08:00
Snownee
7436ceb209 Fix stabilized contraption moving bearing block 2021-01-31 19:24:44 +08:00
Snownee
5c64c2d942 Add server-side check for extendo-grip and contraption interaction 2021-01-31 16:20:42 +08:00
Snownee
4a15fbcec3 Fix funnel filter dupe 2021-01-31 15:28:14 +08:00
Snownee
c5447d5b9c Add NBTProcessors to enable detailed control to tile data.
Add safe check when contraption blocks adding back to world
2021-01-31 14:56:46 +08:00
JozsefA
f6b68acbd5 contraptions self light but it's slightly less slow 2021-01-30 15:37:50 -08:00
JozsefA
16b8e1175e contraptions self light but man it is slow
optimization in PlacementSimulationWorld.getBlockState
2021-01-30 15:00:26 -08:00
Snownee
0c5e67e347 Merge branch 'mc1.15/security-patches' of https://github.com/pau101/Create into mc1.15/security-patches 2021-01-31 03:44:18 +08:00
Snownee
3525ce49ce Player Feedback, Part I 2021-01-31 02:12:31 +08:00
Snownee
c77e7c28d7 Fix gauge not rendering behind door 2021-01-30 21:14:58 +08:00
Snownee
7221f72ddf Optimize contraption assembling 2021-01-30 21:09:04 +08:00
Snownee
08a20972aa Fix broken render state in RenderWorldLastEvent 2021-01-30 18:51:44 +08:00
TUsama
3ad62d2455 change some details 2021-01-30 12:24:16 +08:00
JozsefA
751fc7192d fix rotating stuff on contraptions 2021-01-28 23:59:58 -08:00
JozsefA
1de931a122 make pulley key null, could avoid a crash 2021-01-28 14:41:54 -08:00
JozsefA
b63466774b probably fix the NPEs
start work on adaptive backend
extra sanity stuff for the render manager
massive speedup when rendering a lot of tile entities
2021-01-28 14:39:34 -08:00
JozsefA
04ccf6e738 belt light 2021-01-27 16:28:39 -08:00
JozsefA
e690f2b8ac okay you can use it now
fixed a lighting bug (with a hack, again)
everything now uses the new api
(kinetic components on contraptions are slightly broken)
2021-01-27 14:03:18 -08:00
simibubi
433a508107 Find-Replace for Command Blocks
- Added a new utility command for map-making purposes
2021-01-27 14:26:14 +01:00
JozsefA
67d59540cf THIS IS NOT READY FOR USE
new rendering api/pipeline
not everything is there yet, but a lot is
2021-01-26 19:45:13 -08:00
_0Steven
53a6ad00d5 Crushing More Bugs
-Increase the size of the window in which the crusher picks up items to avoid it skipping over items at some of the highest speeds.
2021-01-26 19:11:45 +01:00
Snownee
b958be0712 Fix desync of FilteringBehaviour 2021-01-26 18:00:47 +08:00
Snownee
8f7945ff4e Fix rope pulley breaking bedrock 2021-01-26 16:48:03 +08:00
Snownee
92a1395b14 Fix spectator can interact with blocks 2021-01-26 15:26:01 +08:00
Snownee
2c3a866494 Fix contraption sticky block connectivity. Add support to PUSH_ONLY push reaction 2021-01-26 15:05:02 +08:00
_0Steven
f1c8e92686 Horizontal Crushers Bugfix
-Fix bug where horizontal crushers would input items they just output when the belt was 'facing' the opposite direction.
2021-01-25 16:39:47 +01:00
JozsefA
1874b267b3 fix a contraption lighting glitch 2021-01-25 01:58:39 -08:00
JozsefA
93353b61d6 smarter light volumes
start the process of creating sane gl abstractions
stabilized contraption bounds now fit tightly with them
fix global tile entity issues
2021-01-25 01:17:55 -08:00
JozsefA
7bac93a03c fix drill orientation issue in contraptions 2021-01-25 00:24:07 -08:00
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
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
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
garyantonyo
eaf131c57f I think this was left in here by mistake. 2021-01-15 01:06:41 -05:00
garyantonyo
b86941a519 Added missing ae2 compatibility recipe. 2021-01-15 00:38:47 -05:00
JozsefA
0bc6b11c5b be smart about rebuilding things
not smart enough about contraptions yet
things mostly render in the correct layers
2021-01-14 14:00:20 -08:00
6af884edb7 Merge https://github.com/Creators-of-Create/Create into mc1.15/experimental-rendering 2021-01-13 22:41:59 +01:00
JozsefA
64b5683ac4 things actually pause when paused 2021-01-13 13:24:45 -08:00
JozsefA
03205c277b move render package up one level 2021-01-13 12:15:48 -08:00
simibubi
511950b766 Hotfix the fix
- More safety for the minecart controller capability
- Blaze burners now support comparators
2021-01-13 18:28:29 +01:00
07b33b66cc Merge https://github.com/Creators-of-Create/Create into mc1.15/experimental-rendering 2021-01-13 16:34:45 +01:00
simibubi
de55778fc5 Extendo clip
- Fixed extendo grips able to attack entities behind blocks
2021-01-13 15:49:55 +01:00
simibubi
f47d1e87c1 You were moved
- runData
- Tried addressing some redstone activation inconsistencies with disassembled contraptions
2021-01-13 14:55:29 +01:00
simibubi
0f60e453f3
Merge pull request #715 from Chubzik1/mc1.15/dev
Update and fixes for ru_ru.json
2021-01-13 14:18:16 +01:00
simibubi
9d5ae97a0a Thank you weakref, very deterministic
- Cart controller safety #669, #684, #702, #708, #709, #714, #719, #722, #725, #728
- Update Registrate #662, #677, #697, #726
- Fixed blocks not able to be placed onto a face with super glue
- Fixed block duplication involving super glue #681, #682
- Fixed fluid tanks voiding content on contrapion disassembly #707
2021-01-13 14:16:45 +01:00
2b615b68bd Fix mixins outside dev env 2021-01-13 09:50:00 +01:00
JozsefA
93a1983302 maybe this actually fixes the memory leak 2021-01-12 22:00:24 -08:00
JozsefA
e5b61891fc update forge and setup mixins 2021-01-12 21:58:40 -08:00
JozsefA
d1dccffc67 fix fan shaft lighting 2021-01-12 12:12:44 -08:00
JozsefA
0ec312340f rainbow debugging and almost correct tints for contraptions 2021-01-12 01:56:30 -08:00
JozsefA
c567437ede fix speed controllers not rendering shafts
switch around render layers for contraptions
2021-01-11 12:08:13 -08:00
JozsefA
1bc99f5224 maybe magically fix all crashes? 2021-01-11 11:15:45 -08:00
Chubz
b1ac81611c
Update and fixes for ru_ru.json
Updated translation to match latest Create version, with some fixes and improvements for the existing lines
2021-01-11 20:43:13 +04:00
JozsefA
379ff9302b rotating stuff renders too now 2021-01-11 01:04:18 -08:00
JozsefA
a56d08b78e a bunch of refactoring to make things easier later
it's not any more stable but belts render on contraptions
rotating things almost do
actually fix a bunch of memory leaks
2021-01-11 00:29:02 -08:00
JozsefA
092a92f095 reorganize some stuff
cart contraptions should at least be positioned correctly
maybe fix a bunch of memory leaks
2021-01-09 21:59:11 -08:00
JozsefA
d2173614dc move lightvolumes down 1 to fix darkness on bottom of contraption 2021-01-09 16:38:30 -08:00
JozsefA
83fa7d34a8 Merge remote-tracking branch 'origin/mc1.15/experimental-rendering' into mc1.15/experimental-rendering 2021-01-09 16:34:31 -08:00
JozsefA
876ddde660 correct contraption lighting 2021-01-09 16:34:22 -08:00
43be3ef8d5 Fix incomplete Render state reset, now doesn't break Journeymap waypoint overlay anymore 2021-01-09 13:16:05 +01:00
JozsefA
7443ac5031 start fixing structure tint 2021-01-08 14:53:22 -08:00
JozsefA
05ab482f70 almost super fast kinetic rendering but we need to detect changes in light first (forge pr?)
fast contraption rendering
2021-01-08 01:29:18 -08:00
JozsefA
fa1e3ea543 solve lighting 2021-01-07 18:31:46 -08:00
JozsefA
0b3615b50e time for some organization pt I 2021-01-07 14:57:10 -08:00
JozsefA
ba2d84e92e whoops 2021-01-07 02:48:24 -08:00
JozsefA
7beeec5e00 maybe lighting is done
starting fast contraption rendering, not safe to use yet
2021-01-07 02:06:40 -08:00
JozsefA
029f56da57 maybe fix held item rendering 2021-01-06 13:02:57 -08:00
JozsefA
d391ed570e maybe fix weird rendering in front stuff 2021-01-06 00:04:19 -08:00
JozsefA
91069163f8 clean shader code 2021-01-05 14:50:36 -08:00
JozsefA
a52b606208 all belts render correctly 2021-01-05 14:49:23 -08:00
JozsefA
5144aa6e63 belts scroll the right way, vertical belts still aren't rotated correctly 2021-01-05 14:39:11 -08:00
JozsefA
c9feda18d6 add missing texture 2021-01-05 13:40:04 -08:00
JozsefA
0b1f73de89 missed a comment 2021-01-05 13:32:50 -08:00
JozsefA
566a370e3b smooth belts 2021-01-05 13:29:45 -08:00
7deb72baa1 Get stuff to compile, clean up unused imports 2021-01-05 11:02:30 +01:00
JozsefA
102e392ab4 merge experimental rendering from 1.16 to 1.15 part II 2021-01-05 10:58:31 +01:00
JozsefA
7d43bb056a merge experimental rendering from 1.16 to 1.15 2021-01-05 10:56:47 +01:00
simibubi
3cdbf47cb9 Adjusted Tooltips 2021-01-04 02:49:47 +01:00
simibubi
1498cb1cfc Why are we still here, Part IV
- Mixers can no longer process single-item recipes
- Added processing recipes for items in AE2
- Fixed pams harvestcraft recipe catalysts not recycling properly
- Windmill bearings no longer assemble when the attached kinetics update
- Hose pulleys now display additional goggle info when their target fluid body is considered infinite
- Protected the natural scoria model from vertex-format changes made by optifine
- Andesite tunnels now split off single items to side outputs
- Fixed non-interpolated item animation on the Mechanical Saw
- Attempted fix to oriented contraption causing serialization issues
- Fixed mounted contraptions not updating yaw interpolation when stalled
- Fixed "shifting gears" advancement not triggering when using the cogwheel placement assist
- Schematicannons no longer cause pasted kinetic networks to be virtually interconnected
- Added sandstone -> sand; milling/crushing recipe
- Fixed Spouts duplicating container items in some configurations
- Fixed block cutting recipe outputs piling up beyond the gui boundaries
2021-01-03 22:29:55 +01:00
garyantonyo
d702784293 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create.git into mc1.15/dev 2021-01-01 22:51:56 -05:00
garyantonyo
089ed5ca6f Adding support for Ice and Fire silver and copper, even though Ice and Fire does not support Create... 2021-01-01 22:46:04 -05:00
simibubi
cdf292295a Why are we still here, Part III
- Fan washing now supports up to 12 output stacks. For your textbook skyblock insanity. #620
- Chance outputs below 1% no longer show 0% in their tooltip
- Fixed creates components picking up dead items #618
- Fixed server-side crash when disassembling contraptions containing a creative crate
2020-12-31 16:02:59 +01:00
simibubi
d5ac8cb3b9 Why are we still here, Part II
- Fixed basins dropping outputs when no spoutput is present
- Lowered overfeeding threshold for blaze cakes
- Brass tunnels no longer distribute in directions against their mounted belt
- Fixed capability issues on millstones
- Fixed incompatibility with The One Probe
2020-12-29 20:45:21 +01:00
simibubi
788f92705d Why are we still here
- Added chocolate and tea fluid tag #580
- Fixed item drain accepting stacks of items to empty
- Fixed basins mistakingly ignoring recipes with 4 or 9 equal ingredients
- Fixed schematicannon not able to place glass pipes, encased pipes, belt funnels and encased shafts
- Fixed race condition with other mods registering spawn eggs
- Belts no longer consume dye
- Tweaked placement constraints and control of cogwheels
- Chocolate and honey buckets can no longer stack
- Minecarts can now collide with non-mounted contraptions
- Attempted some optimizations to contraption lighting
2020-12-27 23:09:19 +01:00
simibubi
2699201661
Merge pull request #593 from Snownee/mc1.15/dev
Bug fixes
2020-12-27 13:25:54 +01:00
simibubi
27e12e6568
Merge pull request #525 from qkrehf2/patch-1
Update ko_kr.json
2020-12-27 13:24:24 +01:00
TUsama
111b63a3c7 0.3 CHS translation
Co-Authored-By: gloomybanana <29054038+gloomybanana@users.noreply.github.com>
Co-Authored-By: Snownee <16059084+Snownee@users.noreply.github.com>
Co-Authored-By: MacrousHyucen <69157544+MacrousHyucen@users.noreply.github.com>
Co-Authored-By: StarFish <56152035+Imbarainbow@users.noreply.github.com>
2020-12-25 22:41:51 +08:00
Snownee
49b5e4957e Fix a typo 2020-12-25 18:11:13 +08:00
Snownee
6df81c8272 Fix belt funnel disappearing on contraption 2020-12-25 17:34:45 +08:00
qkrehf2
388b3d9076
Nevermine the past fix. This is the right one 2020-12-25 18:11:54 +09:00
qkrehf2
bc74108933
Fixed Typo Ko_Kr
I was busy for holidays,, so now I can fix translation
2020-12-25 18:03:02 +09:00
Snownee
e554c5a3ff Solution to #571 2020-12-25 16:06:32 +08:00
Snownee
0cc6fe1de7 Fix liquid tank contents not being rendered (#588) 2020-12-24 21:28:12 +08:00
Snownee
01602c8e77 Fix: Honey block don't have same ability as slime block (#576) 2020-12-24 18:15:36 +08:00
simibubi
32b0a01c3a The magical bucket
- Fixed basins consuming container items with certain output inventories
- Potentially fixed item duplication with stale contraption inventories
2020-12-22 13:18:44 +01:00
6b5e223508 Fixed a big dumb dumb 2020-12-21 16:28:08 +01:00
simibubi
ebf980b33c Itetraitor
- Fixed crash for schematics containing TE's that have no custom renderer attached
- Fixed broken filling recipes with virtual fluids of other mods
- Fixed Brass tunnels duplicating/deleting items
2020-12-21 16:05:32 +01:00
0fe8a24041 Controlling the Assembler 2020-12-21 13:03:16 +01:00
f3653d6b15 Fix TE creation assuming other mods don't crash with SchematicWorld instances (#565) 2020-12-21 09:28:41 +01:00
9336931f30 Press no longer go brrr, just bonk 2020-12-21 09:04:11 +01:00
ae399e9c11 Hopefully fix splitter basin duping #557
Some more thorough testing is needed here to see whether it is actually fixed. I can't reproduce it anymore at least.
2020-12-20 21:48:27 +01:00
simibubi
2a57de3205 Bug Fixes
- Fixed basin not triggering a recipe check when output fluids are emptied
- Fluid behaviour safety on render thread
- Wrenchable Depots
2020-12-19 18:05:37 +01:00
qkrehf2
eafd1e9169
Deleted duplicated words 2020-12-20 01:22:33 +09:00
qkrehf2
efe01af06b
Fixed syntax error + { 2020-12-20 00:39:03 +09:00
Zelophed
f45c0ca182 Assisted Placement, Part II
- helpers now respect waterlogging
- add placement helpers for rsc's cogwheel as well as machines with integrated cogwheels
2020-12-19 15:58:03 +01:00
simibubi
e2437d1a5c Bug Fixes
- Fixed hose pulley not placing source blocks when filling with chocolate or honey
- Added a fluid tag to prevent bottomless draining behaviour of hose pulleys
- Grindstones can now be moved on contraptions
- Fixed fluids zFighting the item drain
- Added some crash safety for coupling rendering
- Updated mixer tooltip
2020-12-19 13:06:09 +01:00
0182316d36 Waterlogged glass pipes 2020-12-19 11:59:56 +01:00
qkrehf2
d4196df040
Translation Final
yay 0.3 updates
2020-12-19 12:24:24 +09:00
simibubi
5b3e1e8c38 Prime patching material
- Fixed open pipe ends not providing fluids to pipe networks
- Safety check for pipe attachment rendering
2020-12-19 00:52:41 +01:00
simibubi
62621f8bdd Mildly problematic
- Fixed broken kinetic propagation caused by bracket handling
- Fixed crash when fluid-interfacing with a contraption loaded from disk
2020-12-18 18:30:58 +01:00
qkrehf2
5dedaebc2e
Update ko_kr.json
yummy translation
2020-12-18 23:53:01 +09:00
simibubi
6c6760ef17 More content, who dis?
- Sprite touch-ups by vectorwing
- Builders Tea
- Bar of Chocolate
- Fixed spouts not rendering fluid particles of virtual fluid types
- Fixed spouts filling bottles inconsistently
2020-12-18 15:13:57 +01:00
qkrehf2
b47ff875a3
Update ko_kr.json 2020-12-18 12:44:13 +09:00
simibubi
68e7d3c34c Bug Fixes
- Snownee's basin render fix
- Fixed milk fluid exchange between vanilla items and the create fluid infrastructure
2020-12-17 23:29:33 +01:00
Daniel Amberson
493cad13d0 i am Indecisive
yea
* brass block got a texture that isn't garbage
* added a prototype brass block that might get used later
2020-12-17 15:32:52 -06:00
Zelophed
e950aa268f Assisted Placement, Part I
- refactor existing placement helpers
- add placement helpers for cogs and shafts
2020-12-16 17:36:22 +01:00
simibubi
743d303bbe Fix #527 2020-12-16 11:32:12 +01:00
simibubi
fa6bac2bfc Locally sourced arms
- Mechanical arms now serialize target positions in relative coordinates
2020-12-16 11:16:46 +01:00
qkrehf2
814c13a8cd
Update ko_kr.json
advancement translation
2020-12-16 15:21:59 +09:00
simibubi
64b2c61389 Bug fixes
- Fixed spout creating potions from any fluid
- Fixed pipes not actually transferring the type of fluid selected by layer II flow propagation
- Fixed some fluid handlers erasing nbt data of extracted fluidstacks
- Fix sidedness issues in Config packets
2020-12-15 23:13:22 +01:00
simibubi
f8b3a77f26 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-12-15 21:16:21 +01:00
simibubi
1840b40e2e Advancing toward the day
- Added advancements for exploring the content
- Adjusted some recipes
2020-12-15 21:16:17 +01:00
qkrehf2
144005059c
Moreee Updates for KR 2020-12-14 17:27:31 +09:00
tterrag
4c26627b73 Fix blaze burner consuming buckets, arm no longer inserts lava buckets 2020-12-13 15:04:55 -05:00
simibubi
d68d702b3a Fun with Recipes
- Added a couple of recipes involving fluids and things
2020-12-13 15:17:31 +01:00
Snownee
a845a70885 Material checklist I18n 2020-12-13 19:56:49 +08:00
Snownee
48d66c7e55 Slightly improve redstone link performance 2020-12-13 08:19:28 +08:00
simibubi
45465fb69b Minor adjustments
- Fluid tanks are not nbt safe
- Mekanism uses reversed ids
2020-12-12 17:33:16 +01:00
qkrehf2
6bdaa3d3e8
Update ko_kr.json 2020-12-12 23:46:16 +09:00
simibubi
a26988db70
Merge pull request #533 from Creators-of-Create/mc1.15/safe-nbt
Safe NBT tag
2020-12-12 15:37:44 +01:00
Snownee
f3053d7e45 Remove unused imports 2020-12-12 19:39:02 +08:00
Snownee
24dcb5383a Make the zapper selection logic server-side (#515) 2020-12-12 19:32:32 +08:00
Snownee
f64dc8c43f Signs are not nbt-safe, due to the ability to execute command 2020-12-12 19:10:59 +08:00
Snownee
0941d9403f Zappers Safe-NBT support 2020-12-12 19:09:10 +08:00
Snownee
1a052d1ec1 Tag data-gen 2020-12-12 05:00:25 +08:00
simibubi
2744cabf14 How to 0.3
- Updated and Finished up remaining item/block tooltips
- Encased belts are now called encased chain drives for easier distinction
2020-12-11 19:36:13 +01:00