Commit Graph

1088 Commits

Author SHA1 Message Date
simibubi
2535ecb917 Attack of the remap
- Fixed two ObfucationHelper lookups
2021-07-30 21:51:05 +02:00
Jozufozu
cd9f18a8c9 WorldAttached contraption rendering
- ContraptionRenderDispatcher's meat was moved to WorldContraptions
 - Rename ContraptionWorldHolder to ContraptionRenderInfo
 - One ContraptionMatrices per contraption per frame
 - Cull contraptions
 - Bump flywheel version
2021-07-28 18:21:07 -07:00
Jozufozu
17421df5ce Contraptions have l a y e r s
- SBB contraption rendering is done through Flywheel's RenderLayerEvent
 - Fix instanced tile rendering on contraptions and in ponder worlds
 - Bump flywheel version
 - Some package-info.javas
2021-07-28 14:25:50 -07:00
PepperBell
b31f5f5d78 Default fallback
- Make stress value getters fallback to default value map if provider is
absent
- Rename StressConfigDefaults to BlockStressDefaults and move to block
package
- Rename StressConfigValues to BlockStressValues and move to block
package
2021-07-27 16:13:50 -07:00
PepperBell
0dea880665 Stress config value refactor
- Add StressConfigValues to allow registering stress value providers and
getting values by namespace
- Use correct namespace inside StressConfigDefaults builder transformers
- Expose StressConfigDefaults maps
- Add methods to manually register default stress values
- Only add stress configs for defaults that have the create namespace
- Clean up ItemDescription#getKineticStats
2021-07-27 13:25:16 -07:00
simibubi
eea9778840 Post-PR datagen 2021-07-27 13:43:58 +02:00
simibubi
e01a53b10e
Merge pull request #2037 from TheRamenChef/patch-2
Add milling recipes for beetroots and sea pickles
2021-07-27 13:30:43 +02:00
Jozufozu
cb8e6d92d5 Contraptions use flywheel for vanilla tiles
- Update more usage of glActiveTexture to the enum wrapper
 - Fix superglue rendering in the solid layer
 - Fix issue caused by states with different textures on contraptions
 - Bump flywheel version
2021-07-26 16:27:18 -07:00
TheRamenChef
fc0e7a0a66
Add milling recipes for beetroots and sea pickles 2021-07-25 11:58:41 -05:00
zelophed
74d57f38fe Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-07-25 04:13:08 +02:00
zelophed
e944906519 overlayn't
- add config options that allow some more customization of the overlay renderer (addresses #2020)
- overlay position has been reset to its default position, because the config path changed

- allow integer config values to be entered and displayed as hex or binary (inside the config gui only)
- how integer values are displayed can be changed with a special comment
- minor changes to theme, that allow keys to refer to one another
2021-07-25 04:12:56 +02:00
simibubi
b6b6b32e96 SuperBustedBuffer
- Removed obsolete milk filling/draining code and recipes
- Fixed lack of transforms on cpu rendered stuff
- Move fluid remapper to RemapHelper
2021-07-24 22:32:27 +02:00
simibubi
65f1748e04
Merge branch 'mc1.16/dev' into fix-milk 2021-07-24 20:57:05 +02:00
Jozufozu
976017d084 Merge branch 'mc1.16/dev' into mc1.16/flw/vanilla-opt 2021-07-23 12:35:56 -07:00
PepperBell
8f6dcb8ba6 Fix resource leak
- Fix ponder resources not being closed properly
2021-07-22 16:13:03 -07:00
Jozufozu
b188f97ae0 Merge branch 'mc1.16/dev' into mc1.16/flw/vanilla-opt 2021-07-22 14:10:20 -07:00
PepperBell
c3f87ec347 Recipe interface
- Add IRecipeTypeInfo to replace AllRecipeTypes method calls in most
cases to allow for better addon support
- Tweak some visibility modifiers
2021-07-22 13:40:40 -07:00
Jozufozu
a52b6d766f MaterialGroups and massive refactors
- Move material stuff to its own package
 - The various render functions in the material tree now bind to specific render layers
 - Instancers can choose which layer to use
 - The layers are SOLID, CUTOUT, and TRANSPARENT
 - More layers are likely unnecessary, but we'll see
 - Deprecate functions in MaterialManager in favor of more builderesque ones using MaterialGroups
 - Catching up with Flywheel
 - Remove MatrixStacker in favor of Flywheel's TransformStack (thread safety too)
2021-07-21 20:30:35 -07:00
PepperBell
d5e659dad2 Merge remote-tracking branch 'upstream/mc1.16/creative-cake' into
mc1.16/dev

Conflicts:
	src/generated/resources/.cache/cache
	src/generated/resources/assets/create/lang/unfinished/ja_jp.json
	src/generated/resources/assets/create/lang/unfinished/ru_ru.json
2021-07-18 19:47:39 -07:00
simibubi
1e7078fe56 One-liner marathon
- Version bump
- Implement #1969
- Guard emptying JEI integration from empty item outputs, addresses #1994
- Goggles icon no longer renders when menu button is set invisible, addresses #1979
- Fixed missing blaze burner in JEI's display of heated compacting recipes, addresses #1970
2021-07-18 17:37:14 +02:00
PepperBell
01366e30bb Merge remote-tracking branch 'upstream/mc1.16/dev' into
mc1.16/creative-cake

Conflicts:
	src/generated/resources/.cache/cache
	src/generated/resources/assets/create/lang/unfinished/zh_tw.json
2021-07-17 17:52:39 -07:00
PepperBell
4bdd802170 Organize imports 2021-07-17 00:46:35 -07:00
PepperBell
ca94873148 Ponder namespace refactor
- Add full support for custom namespaces in ponder
- Make ponder files use Minecraft's resource system
- Allow easily registering and generating ponder lang for any namespace
2021-07-17 00:39:05 -07:00
PepperBell
1dd7c4bc1e Minor cleanup changes
- Change AllRecipeTypes to have less repetition and force getter usage
2021-07-16 15:11:28 -07:00
PepperBell
7ec02fd040 Merge remote-tracking branch 'upstream/mc1.16/dev' into
mc1.16/creative-cake

Conflicts:
	src/main/java/com/simibubi/create/AllBlocks.java
	src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlock.java
	src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerHandler.java
	src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerTileEntity.java
	src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java
2021-07-15 13:21:47 -07:00
d53e89887a fix obfuscation reflection helper calls 2021-07-15 11:45:45 +02:00
9e4198fa79 fix mixins 2021-07-15 11:39:37 +02:00
a048285699 Bulk remap, compiles 2021-07-15 11:32:03 +02:00
PepperBell
a17dd26aab Add creative cake
- Item texture and particle colors are not final
2021-07-14 13:29:02 -07:00
reidbhuntley
f3a521121d Advanced Arm Applications
- Mechanical Arms remember their targets when placed by Schematicannon (for real this time)
- Mechanical Arms will now rotate/mirror their targets when rotated/mirrored in a schematic or contraption
2021-07-12 22:03:22 -04:00
simibubi
2300e0e58a Bug Fixes
- Copper backtanks can no longer accumulate air pressure when waterlogged
- Copper backtanks now emit a comparator output
- Removed id prefix requirement for ponder and seq. assembly tooltips #1931
- Improved the odds to succeed of existing sequenced assembly recipes
- "junk" -> "salvage"
2021-07-12 20:02:47 +02:00
reidbhuntley
cb41ac679d Use custom FakePlayer for converting Zombie Villagers 2021-07-12 00:43:23 -04:00
zelophed
4306d076db slow and steady
- add create's panorama as a background for config ui when opened from the main menu
- fix panoramas moving at a inconsistent speed

- add a optional speed limit to physical floats
2021-07-11 21:09:23 +02:00
PepperBell
e3386c178a Minor SBB clean up
- Allow custom light from dual (utility) light method to be applied
- Reorganize and rename some members
2021-07-10 22:39:42 -07:00
reidbhuntley
3ab3bffac3 Bump StressConfigDefaults version number
- Should fix Mechanical Arm stress usage staying at the old value in worlds created in previous Create versions
2021-07-10 23:30:27 -04:00
simibubi
4a57b916ff Top ten hotswap engineering oversights
- Fixed reversed frequency display of Redstone Links
2021-07-11 01:28:28 +02:00
simibubi
2821fd7135 Lamptank
- Fixed custom rendered models rendering full bright when supposed to render full dark
2021-07-11 01:14:38 +02:00
Jozufozu
f1da8b8f1e Cull code to fix crash on mac
- A bunch of dead code removal
2021-07-10 15:20:34 -07:00
282a9a6f3a Fix valve handles not having a tooltip 2021-07-10 18:46:44 +02:00
reidbhuntley
bc456a76cd Tuber Tube Tidy-up
- Set recovery chance for unenchanted Potato Cannons to 0
- Power enchantment on Potato Cannons now scales the damage of the projectile type instead of adding to it
- Changed Potato Cannon crafting recipe to better fit the new model
2021-07-09 23:11:16 -04:00
e56da570e8 Limit the light 2021-07-09 23:38:28 +02:00
simibubi
352f213429 Buffing the Buffers
- Fixed large amounts of output in crushing wheels getting voided due to its buffer capacity
- Fixed basin processing running constant recipe lookups while backed up #1911
- Fixed mixer retracting after every operation when auto-output is active
2021-07-09 19:27:50 +02:00
PepperBell
7ed7b957dd Flaming souls
- Add soul flame type to lit blaze burner
- Tweak empty blaze burner ponder to show how to transform flame
2021-07-09 00:28:21 -07:00
PepperBell
cf3ef8c229 Fix saw blade culling
- Remove AllColorHandlers as it was empty
- Organize imports
2021-07-08 11:17:35 -07:00
simibubi
5a031bb99d CrushCrushCrush
- Added some rudimentary crushing ambience
- Dyed nixie tubes now return the correct item for Pickblock and Schematicannons
2021-07-08 16:22:59 +02:00
simibubi
d418f06f37 Magitank
- Copper Backtanks can now be enchanted
- Added the Capacity Enchantment
2021-07-08 00:03:58 +02:00
simibubi
905b140a2f Dyeable Nixies, Part II
- Ponder doc
- Fixed a few colours
- Fixed text wipe on colour change
- Fixed pick block
- Nixie Tubes can now be picked up using the Wrench
2021-07-06 18:35:41 +02:00
simibubi
8f234b7fa8 Dyeable Nixies, Part I 2021-07-06 15:04:22 +02:00
b2e3fe6fd1 get horizontal water wheels ready for 1.16 2021-07-06 10:25:00 +02:00
f4d73118b1 merge more of the new stuff 2021-07-06 10:05:26 +02:00