JozsefA
08b2c498e6
Add basic blocks and TEs for the chromatic projector
2021-04-09 16:16:25 -07:00
simibubi
edb1b59f41
Housekeeping
...
- Added an .editorconfig
- Auto-Reformatted most .java files
- Auto-Organized Imports
2021-04-08 19:22:11 +02:00
f19c6ab763
- Deforester now hits forge hooks for tool break, block break, times used.
...
-Moved deforester not loosing durability from leaves to DeforesterItem instead of Tree mining
- added destroyBlocks method in TreeCutter$Tree for less doubled code
- Mechanical Saws currently break the tree with an empty "hand" as they did before
- Silktouch and Fortune enchants are now being applied from deforesters
2021-04-07 14:07:06 +02:00
JozsefA
78fbb52ddc
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.16/dev
...
# Conflicts:
# src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java
# src/main/java/com/simibubi/create/content/curiosities/TreeFertilizerItem.java
2021-03-31 21:17:01 -07:00
Snownee
ba63cc3e7f
Fix tree fertilizer spreading podzol. Backport a440ab6
2021-04-01 01:43:06 +08:00
90b9a3aff9
Merge & Port
2021-03-29 10:57:50 +02:00
simibubi
5299204fb5
Better Tooltip Integration
...
- Removed overlapping tooltips
- Adjusted tooltip presentation for more visual consistency
2021-03-28 20:56:55 +02:00
zelophed
683d18b994
tick off some todos
2021-03-28 04:19:58 +02:00
5a176204a5
Merge & Port
2021-03-26 22:17:23 +01:00
simibubi
0afb29f9a6
Simulate and Translocate
...
- Adjusted Brass Tunnels once again to better deal with non-complete item transferrals
- Brass tunnels now always output to their sides first
- Thrown chromatic products are now gravity-less
- Sneaking on Ejectors bypasses them triggering
- Fixed ponder tag item listing
- Ejectors now trigger observers
- Fixed negative bottom pull distance in chutes
- Fixed smart chutes deleting non-stackable items
- Fixed chutes not able to output partial stacks
- Ejectors can now be paused with redstone
- Deferred ejector launches by one tick to 'unground' entities more consistently
2021-03-26 18:41:03 +01:00
zelophed
e26191aaf7
GuiGameReposition
...
- adjust the position of the item renderer for gui elements
- include a warning when joining a world while fabulous graphics are enabled
2021-03-25 02:27:10 +01:00
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
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
simibubi
6c8fe67fd4
Gradle Mondays
...
- Replaced ponderworld particle AT with reflection
- Symmetry Wand now checks for placement permissions
- Lang now uses Locale.ROOT
- Fixed crash using ponder without advanced tooltips enabled
2021-03-08 22:12:25 +01:00
simibubi
c1c6e5e046
Controlled attachment
...
- Added the Sticker, a redstone-driven block attachment component
- Fixed lighting of TileEntities lowered by a pulley
2021-03-03 05:21:58 +01:00
31e3c5b0bd
Port recent changes
2021-02-20 17:27:51 +01:00
a3f2fbe788
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
2021-02-19 16:39:11 +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
simibubi
4ee9dd8a8a
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-02-19 00:49:39 +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
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
Snownee
676a05ad07
Fix rose quartz duplication glitch ( #1104 )
2021-02-14 11:18:38 +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
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
simibubi
d7a41b7810
Port new changes
...
- Fix incompatible resource pack version
2021-02-06 22:03:48 +01:00
simibubi
2700832dff
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-02-06 21:41:02 +01: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
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
Snownee
b1b771ed2e
Fix extendo grip applying knockback on arrow or tnt damage
2021-01-14 12:34:41 +08:00
simibubi
877d6dc2ee
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-01-13 15:50:32 +01:00
simibubi
de55778fc5
Extendo clip
...
- Fixed extendo grips able to attack entities behind blocks
2021-01-13 15:49:55 +01:00
simibubi
ecd5858ece
Merge branch 'mc1.15/dev' into mc1.16/dev
2020-12-18 18:36:51 +01: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
simibubi
bb5efd68f1
Fix #535
2020-12-13 18:23:45 +01:00
simibubi
a50b9bc6d1
Port new changes
2020-12-12 17:42:19 +01:00
simibubi
7760db875c
Merge branch 'mc1.15/dev' into mc1.16/dev
2020-12-12 17:42:12 +01:00
Snownee
24dcb5383a
Make the zapper selection logic server-side ( #515 )
2020-12-12 19:32:32 +08:00
Snownee
0941d9403f
Zappers Safe-NBT support
2020-12-12 19:09:10 +08:00
simibubi
42215b8eb0
Merge branch 'mc1.15/dev' into mc1.16/dev
2020-12-11 21:23:31 +01:00
Snownee
e529c254c8
Fix block zapper not updating blocks correctly
2020-12-10 15:01:11 +08:00
Snownee
77e9a75877
Use cached directions
2020-12-10 09:36:59 +08:00
a00f619017
porty porty all the PRs
2020-11-15 10:41:05 +01:00
Snownee
466739bcf5
Fix Extendo Grip knockback
2020-11-11 10:52:57 +08:00
simibubi
0a98171384
Merge branch 'mc1.15/dev' into mc1.16/dev
2020-11-06 20:49:00 +01:00
