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
zelophed
f47feee20d
its called padding
...
- also includes some more changes to theme and colors
2021-04-28 21:44:03 +02:00
zelophed
de00f90a37
pondering all over again
2021-04-27 02:48:50 +02:00
tterrag
9697a30d76
Remove references to antlr IntegerList in favor of fastutil IntList
2021-04-18 14:04:08 -04: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
edb1b59f41
Housekeeping
...
- Added an .editorconfig
- Auto-Reformatted most .java files
- Auto-Organized Imports
2021-04-08 19:22:11 +02:00
zelophed
7ad0575618
fancy text
2021-04-07 02:17:55 +02: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
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
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
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
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