JozsefA
341a385628
Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector
...
# Conflicts:
# src/generated/resources/assets/create/lang/en_us.json
# src/main/java/com/simibubi/create/AllBlocks.java
# src/main/java/com/simibubi/create/AllTileEntities.java
# src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntity.java
# src/main/java/com/simibubi/create/foundation/gui/AllIcons.java
# src/main/java/com/simibubi/create/foundation/networking/AllPackets.java
# src/main/resources/assets/create/textures/gui/icons.png
# src/main/resources/create.mixins.json
2021-05-23 14:11:40 -07:00
simibubi
aea44aa3fb
Merge pull request #1613 from reidbhuntley/schematics-crash
...
Various bugfixes regarding schematics
2021-05-22 17:50:45 +02:00
reidbhuntley
c2cc124239
Better support for partially safe NBT writing
2021-05-21 20:33:28 -04:00
reidbhuntley
68b3ba7215
Allow Schematicannon to defer blocks to print at end
2021-05-21 16:57:01 -04:00
reidbhuntley
ff5984a48e
Prevent rail fix from allowing floating rails
2021-05-21 13:38:13 -04:00
reidbhuntley
8edfa73352
Hack to prevent rails placed by cannon from updating
2021-05-20 13:50:42 -04:00
PepperBell
dac9010f20
Optimize lighting checks
...
Also
- Set null layer after rendering contraption
2021-05-14 17:23:10 -07:00
PepperBell
6c1c7a10d9
Fix darker contraptions
...
Also
- Partially fix incorrect vertex lighting (make sure to not sure Forge's lighting calculator)
- Reorder some lighting to make it more efficient
- Cleanup some things
2021-05-14 16:34:35 -07:00
JozsefA
f6937ffb0c
Only a few moves left
...
- flywheel stuff only barely depends on create
- start drafting what multiple backends could look like
2021-05-11 11:02:43 -07:00
PepperBell
970a5c2f53
Fix JEI Scene Lighting
...
- Fix sudden light transitions in JEI scenes
- Allow block GuiGameElements to set custom lighting
- Remove deprecated GuiGameElement methods
2021-05-06 14:14:31 -07:00
PepperBell
4ed97b3655
Fix super glue rendering
...
- Fix super glue normals, rotation, and reflection.
- Move render check to appropriate method.
- Minor optimizations.
2021-05-06 14:10:12 -07:00
zelophed
fd62f2f8f4
Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev
...
# Conflicts:
# src/main/java/com/simibubi/create/CreateClient.java
# src/main/java/com/simibubi/create/compat/jei/category/BlockzapperUpgradeCategory.java
# src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandScreen.java
# src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperScreen.java
2021-05-03 19:58:39 +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
JozsefA
15f4cd305e
Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector
2021-05-02 11:50:39 -07:00
simibubi
b086fbd1f2
Merge pull request #1520 from PepperCode1/mc1.16/reload-listeners
...
Tweak Reload Listener Classes
2021-05-02 17:39:29 +02:00
JozsefA
67e75d747a
Move backend
2021-05-01 16:32:09 -07:00
simibubi
8fff3d6745
The great second purge of Tools
...
- Removed the Blockzapper
- Removed the Deforester
- Handheld Worldshaper -> Creative Worldshaper
- Worldshapers now have a "surface" and "cluster" brush type
- Worldshapers now follow the creative colour palette
- Some UI touch-ups for tools
2021-05-01 13:19:01 +02:00
JozsefA
446b24f1cf
Random stuff
...
- Multiply by 31 in some hash functions
- Remove unused render utility classes
2021-04-29 11:44:45 -07:00
PepperBell
80921ebd6b
Remove ISimpleReloadListener lambda types
2021-04-28 21:25:06 -07:00
PepperBell
61f2a35a61
Add ISimpleReloadListener
...
ISimpleReloadListener is a reload listener functional interface meant to
be used when preparation is not needed. All current reload listeners
have been moved to this interface, which allows them to be lambdas and
not have to create a new Object for every reload.
2021-04-28 13:37:21 -07:00
zelophed
de00f90a37
pondering all over again
2021-04-27 02:48:50 +02:00
zelophed
c85870ea2d
boxing elements
2021-04-25 19:54:18 +02: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
JozsefA
cbb7e48565
Revert "Don't crash with starlight"
...
This reverts commit 4ae1ce3d
2021-04-09 16:21:38 -07:00
simibubi
edb1b59f41
Housekeeping
...
- Added an .editorconfig
- Auto-Reformatted most .java files
- Auto-Organized Imports
2021-04-08 19:22:11 +02:00
b10203db01
Extract block breaking in TreeCutter.Tree to AbstractBlockBreakQueue for better reusability and option of saw passing a different item
2021-04-07 15:13:07 +02:00
ac8c1e1468
Fixed unported stuff, tree cutter now does sound effects at the right probability again
2021-04-07 14:29:41 +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
4ae1ce3dbe
Don't crash with starlight
2021-04-05 23:23:35 -07:00
zelophed
d4994ddc8b
entry point
2021-04-06 00:05:29 +02:00
JozsefA
3b05e06d35
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-04-03 18:45:23 -07:00
JozsefA
c55351e980
Fix nullpointer with starlight
2021-04-03 18:33:47 -07:00
simibubi
47bd1d9c93
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-04-04 00:58:14 +02:00
simibubi
62b1fe82b7
Fix-ups Cont'd
...
- Fixed Spawners losing nbt data when moved
- Nixie tubes now update their texts starting from the clicked block, rather than the leftmost one in the chain
- Fixed inconsistency between block and item model of the furnace engine
2021-04-03 23:49:59 +02:00
simibubi
b845809b58
The great Escape
...
- Adresses #1324
2021-04-03 19:50:42 +02:00
simibubi
69c3a57c76
Quell the outrage!
...
- Placement indicator arrow is slightly smaller by default
2021-04-03 19:46:26 +02:00
simibubi
1fd6b4360c
Performant fictional entities
...
- Fixed crash with the Performant mod when entities are present in a ponder scene
2021-04-03 19:30:38 +02:00
zelophed
809bc6bf88
merge and port
2021-04-03 01:16:14 +02:00
zelophed
e05eb5c386
Merge branch 'mc1.15/dev' into mc1.16/dev
...
# Conflicts:
# src/main/java/com/simibubi/create/foundation/config/CClient.java
# src/main/java/com/simibubi/create/foundation/utility/placement/PlacementHelpers.java
2021-04-03 01:00:57 +02:00
zelophed
7a6b1c6949
0.3.1 hotfixes, part I
2021-04-03 00:54:28 +02:00
simibubi
2b4ef88fc1
Merge branch 'mc1.15/dev' into mc1.16/dev
2021-03-31 14:50:16 +02:00
simibubi
0bb18db4b6
Oriented bouncing and sliding
...
- Slime blocks on a moving Contraption are now bouncy
- Ice blocks on moving Contraptions are now very slippery
2021-03-31 03:16:29 +02:00
358ff25031
Fix 1.16 too, i guess
2021-03-29 23:25:28 +02:00
zelophed
0b6098817e
fix some wrench rotation issues
2021-03-29 20:31:08 +02:00
dadde271e4
Fix even more critical crashes, now on schematics
2021-03-29 18:19:17 +02:00
69f4c9f8ad
Fix WrappedWorld.getLightingProvider being null and crashing
2021-03-29 17:19:18 +02:00
zelophed
683d18b994
tick off some todos
2021-03-28 04:19:58 +02:00
zelophed
c9ba76a2d1
Assisted Placement, Part IV-c
...
- indicator renders again
- changed the config to allow the indicator to be disabled altogether
2021-03-27 16:01:05 +01:00
fe10c258c4
Merge & Port
2021-03-26 23:13:49 +01:00
