Commit Graph

1239 Commits

Author SHA1 Message Date
simibubi
13e8f67d05
Merge pull request #900 from SuicidalSteve/mc1.15/dev
Omnidirectional Crushing Wheels
2021-02-19 15:01:19 +01:00
589572df6c kill kinetic block trigger, clean up unused stuff 2021-02-19 14:49:22 +01:00
simibubi
37434f3933
Merge pull request #1045 from TheBv/mc1.15/dev
Fixed issues with the blockzapper and FTBChunks
2021-02-19 14:46:48 +01:00
simibubi
fd65acd91d
Merge pull request #1062 from Snownee/mc1.15/dev
Bug fixes
2021-02-19 14:22:37 +01:00
667c213506 remove unused light absorb trigger 2021-02-19 14:13:18 +01:00
3f9ee09953 Rework Bracket trigger to now be a registry trigger based on base block 2021-02-19 14:12:26 +01:00
d9aa912796 generic registry based triggers (replaced kinetic block trigger and infinite fluid trigger) 2021-02-19 09:09:29 +01:00
Franco Paladini
7c0d0b6439
Update es_es.json 2021-02-19 00:53:47 -03:00
Franco Paladini
54ca447301
Update es_es.json 2021-02-19 00:53:29 -03:00
Kryppers
e2ccb80870 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2021-02-18 22:57:32 +00:00
Kryppers
3c48ece021 It's the Funnel Countdown
d-do-do dooo, do-de-do-do-doooo
2021-02-18 22:57:25 +00:00
JozsefA
84c9569707 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/experimental-rendering 2021-02-18 14:10:43 -08:00
JozsefA
3e63afa5f5 fix concurrent modification 2021-02-18 14:00:17 -08:00
7023148e7f generic infinite fluid triggers 2021-02-18 23:00:17 +01:00
8c8a9abd8a Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
# Conflicts:
#	src/generated/resources/assets/create/blockstates/fluid_pipe.json
2021-02-18 22:32:45 +01:00
simibubi
d59fea1079 Bloat.
- Auto-Organize inputs
- runData after lang PRs
- change runWhenOn to non-deprecated unsafeRunWhenOn, now that late forge version is required
- Address a few warnings
2021-02-18 19:43:22 +01:00
Franco Paladini
9c1ab785d7
Update es_es.json 2021-02-18 15:00:07 -03:00
simibubi
c0b6a55209
Merge pull request #1075 from CKenJa/mc1.15/dev
Localize Fixes
2021-02-18 18:08:19 +01:00
simibubi
616bc09267
Merge pull request #1040 from Chexet48/patch-2
Update it_it.json
2021-02-18 18:07:11 +01:00
simibubi
cf34b2e96b Fix fast fluid valves
- Ensure animated indicators on fluid valves still show up with experimental rendering
2021-02-18 18:05:39 +01:00
simibubi
3ff3992f97
Merge pull request #1118 from Jozufozu/mc1.15/experimental-rendering
Experimental Rendering
2021-02-18 17:59:52 +01:00
Kryppers
779b19b377 Multiple Thread improvements.
improved the threads.
2021-02-18 16:01:05 +00:00
simibubi
203ca6f849 Birbs and Click input 2021-02-18 15:44:18 +01:00
muriplz
f8d6f73f8a Update es_es.json 2021-02-18 12:26:59 +01:00
muriplz
a52865666a Update es_es.json 2021-02-18 12:19:40 +01:00
muriplz
310cbd484c Update es_es.json 2021-02-18 12:09:09 +01:00
JozsefA
9b4d53d452 fix one residual merge conflict.
creating matrix stacks is expensive, but correct.
2021-02-17 14:27:49 -08:00
JozsefA
24ab4e181f Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/experimental-rendering
# Conflicts:
#	src/main/java/com/simibubi/create/CreateClient.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
#	src/main/java/com/simibubi/create/events/ClientEvents.java
#	src/main/resources/META-INF/accesstransformer.cfg
2021-02-17 14:06:13 -08:00
JozsefA
02db3f5a2c fix some problematic code.
creating matrix stacks is expensive, apparently
2021-02-17 13:58:24 -08:00
Franco Paladini
22c03c4a14
Update es_es.json
accents suppressed
2021-02-17 16:56:09 -03:00
Franco Paladini
9048442fec
Update es_es.json 2021-02-17 16:52:50 -03:00
Franco Paladini
607ce9edca
Update es_es.json 2021-02-17 16:43:06 -03:00
Franco Paladini
9d57a25104
Update es_es.json 2021-02-17 16:42:37 -03:00
Franco Paladini
bd49e9bc7f
Update es_es.json 2021-02-17 16:39:07 -03:00
Franco Paladini
2f9607a196
Update es_es.json 2021-02-17 16:29:35 -03:00
JozsefA
a5d6262424 fix mechanical crafter cogs 2021-02-17 11:24:40 -08:00
Franco Paladini
d187dc0b38
Update es_es.json 2021-02-17 14:50:28 -03:00
Zelophed
159e298e8b paletted contraptions
- use minecraft's palette-map during serialization and deserialization to reduce compound size in most cases
- also update the placement_indicator sprite sheet
2021-02-17 17:21:31 +01:00
Franco Paladini
a4c96be51c
Update es_es.json 2021-02-17 08:24:41 -03:00
Franco Paladini
36553c6ee0
Update es_es.json 2021-02-17 01:01:01 -03:00
Franco Paladini
c4c57c6ba1
Update es_es.json 2021-02-16 23:41:47 -03:00
JozsefA
7aa175dd9c fix gantry cogs skipping every half rotation 2021-02-16 15:13:48 -08:00
Franco Paladini
ed04fd1d52
Update es_es.json 2021-02-16 19:54:49 -03:00
JozsefA
d2e30eeab5 finish merge
remove old assets
2021-02-16 14:47:03 -08:00
Zelophed
bec13b8e7d Assisted Placement, Part IV-b 2021-02-16 22:50:11 +01:00
c6f82bff5e Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-02-16 20:29:40 +01:00
simibubi
fd99acc00a Merge branch 'mc1.15/dev' into mc1.15/ponder-ui 2021-02-16 19:36:12 +01:00
simibubi
18067e8d5c Ponder
- rebrand
- support for particles
- support for fluids
- support for outliner
- coloured text labels
- debug scenes
- proper UI stuff
- proper layered rendering
2021-02-16 19:35:26 +01:00
Franco Paladini
e4fe371d4c
Add Spanish language (es_es) (unfinished) 2021-02-16 13:59:05 -03:00
JozsefA
15302495f5 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/experimental-rendering-merge
# Conflicts:
#	src/main/java/com/simibubi/create/AllEntityTypes.java
#	src/main/java/com/simibubi/create/AllSpriteShifts.java
#	src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntityRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntity.java
#	src/main/java/com/simibubi/create/foundation/command/AllCommands.java
#	src/main/java/com/simibubi/create/foundation/utility/outliner/Outliner.java
2021-02-15 21:27:08 -08:00
Zelophed
b9d1a586c1 Assisted Placement, Part IV
- added 👻-blocks as a placement preview
2021-02-16 00:48:13 +01:00
JozsefA
1e95fe4c7b avoid floating point accuracy errors at high coordinate values.
refactor contraption model translation to be a method in AbstractContraptionEntity.
 - this simplifies the setup required for the fast rendering.
2021-02-14 23:09:17 -08:00
Snownee
5e14ca71d9 Add max stack size check to ItemHelper.extract 2021-02-14 11:51:31 +08:00
Snownee
676a05ad07 Fix rose quartz duplication glitch (#1104) 2021-02-14 11:18:38 +08:00
JozsefA
11616a0b16 avoid 'glGet's at all costs 2021-02-13 16:26:34 -08:00
JozsefA
951a0c4769 contraption actors take into account self lighting 2021-02-13 13:10:14 -08:00
JozsefA
0ad6db4bf7 cache KTEs' renderBoundingBox 2021-02-12 23:06:41 -08:00
Snownee
2d2c7e653f Avoid unnecessary piston contraption assembling 2021-02-13 14:14:28 +08:00
JozsefA
b1905ddfd4 probably fix issue with phosphor crashing contraptions 2021-02-12 21:11:35 -08:00
Snownee
dae651c046 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2021-02-13 13:06:11 +08:00
JozsefA
e88dd89262 whoops null pointer is no more 2021-02-12 19:33:13 -08:00
JozsefA
485a0d2f95 hotswapping is more sane now. 2021-02-12 17:30:21 -08:00
JozsefA
a5f3d799d1 kinda separate system capability stuff, should probably clean this up more.
fix lighting glitches on world load.
2021-02-12 16:36:20 -08:00
simibubi
8ab27904db More Instructions 2021-02-12 17:08:48 +01:00
JozsefA
d824304f12 tile entities on contraptions account for self lighting 2021-02-12 00:13:39 -08:00
JozsefA
a8053ce472 these are somewhere else too 2021-02-11 23:41:52 -08:00
JozsefA
31a1fd71ce everything is somewhere else 2021-02-11 23:36:05 -08:00
JozsefA
67408e0dff better vertex attributes.
all shaders are now GL 2.0 compatible!!!
contraption structure rendering is technically 2.0 compatible now, need some better handling for that.
2021-02-11 20:03:24 -08:00
Zelophed
34de9a0319 Player Feedback, Part III 2021-02-12 03:13:19 +01:00
JozsefA
576165e3d6 some attrib stuff 2021-02-11 14:31:50 -08:00
Zelophed
82e922032a Merge branch 'mc1.15/feedback2' into mc1.15/dev
# Conflicts:
#	src/generated/resources/.cache/cache
#	src/generated/resources/assets/create/lang/unfinished/de_de.json
#	src/generated/resources/assets/create/lang/unfinished/fr_fr.json
#	src/generated/resources/assets/create/lang/unfinished/it_it.json
#	src/generated/resources/assets/create/lang/unfinished/ja_jp.json
#	src/generated/resources/assets/create/lang/unfinished/ko_kr.json
#	src/generated/resources/assets/create/lang/unfinished/nl_nl.json
#	src/generated/resources/assets/create/lang/unfinished/pt_br.json
#	src/generated/resources/assets/create/lang/unfinished/ru_ru.json
#	src/generated/resources/assets/create/lang/unfinished/zh_cn.json
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/StabilizedContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyContraption.java
2021-02-11 20:07:38 +01:00
Zelophed
b4c881a6c8 Player Feedback, Part II 2021-02-11 17:47:55 +01:00
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