mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-16 15:34:39 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,044 Commits 31 Branches 14 Tags 106 MiB
760486adb6
Commit Graph

2044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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