Commit graph

198 commits

Author SHA1 Message Date
simibubi
1a8434d09c Flywheel Bump 2022-09-06 15:49:02 +02:00
PepperCode1
62f7364b06 Fix build and JiJ Flywheel
- JiJ Flywheel since Forge 1.19 fixed mixin JiJ
- Add JEI common API as compile time dependency
2022-08-18 09:27:06 -07:00
PepperCode1
f7280b799c 1.19.2 and improvements
- Update to 1.19.2
- SuperByteBuffer no longer accepts a null RenderedBuffer
- Add datagen code for BiomeModifiers
- Switch back to Parchment mappings
2022-08-13 23:42:34 -07:00
PepperCode1
69b4973cac Merge branch 'mc1.18/dev' into mc1.19/dev
Conflicts:
	gradle.properties
	src/main/java/com/simibubi/create/content/contraptions/fluids/PumpBlock.java
2022-08-13 21:10:01 -07:00
simibubi
65073e84bd Patch D 2022-08-13 23:19:44 +02:00
simibubi
a1b949c084 Graddle me this
- Temporarily regress to FG 5.1.53
2022-08-13 18:13:20 +02:00
PepperCode1
4ea1f3e620 Final Flywheel Fixes
- Update Flywheel
- Resolve all remaining errors
2022-08-03 23:43:36 -07:00
PepperCode1
233d9b292e Version Conversion: 1.19 edition
- Mostly port to 1.19
- Remaining errors include:
  - Fluids
  - Features
  - Registry-related code
  - Fake worlds
  - Some datagen code
2022-07-25 23:33:10 -07:00
PepperCode1
82be76d893 JEI building, Gradle building
- Refactor JEI category building
- Fix placard item requirement not checking NBT
- Use AddPackFindersEvent instead of ShippedResourcePacks
- Remove unused config values
- Provide separate resource and data formats in pack.mcmeta
- Compress all images
- Update to latest Flywheel
- Disable jarJar inclusion of Flywheel
- Use ${file.jarVersion} instead of ${version}
- Add workaround for SpongePowered/MixinGradle#38
2022-07-16 01:58:43 -07:00
PepperCode1
4c45333687 JarJar Artifact Jar
- Use JarJar
  - Include Flywheel automatically
  - Include Registrate instead of shading it
- Refactor Maven coordinate scheme
  - Artifact ID: "Create" -> "create-{minecraft_version}"
  - Artifact Version: "{mod_version}.{patch}-{build_number}"
- Exclude datagen cache from built jars
- Include LICENSE file in build jars
- Sync mods.toml version with gradle.properties version
- Use more modern publication code
- Update Gradle: 7.4.1 -> 7.4.2
2022-07-14 15:02:24 -07:00
simibubi
1ec63c1511 Patch it while its hot
- Fixed Dedicated server crash when riding a train
- Fixed broken localisation component in super glue editor
- Fixed display links not showing correct icons for dyed nixie tubes
2022-07-12 17:51:25 +02:00
simibubi
370414846d bumb 2022-07-12 03:15:12 +02:00
Jozufozu
ef24999e31 Contraption's runway debut
- Contraptions support modeldata
 - Fixes issue where the wrong casing appeared on belts assembled to contraptions
 - Bump flywheel build
2022-07-11 14:37:26 -04:00
simibubi
3153ad2100 bug you a pardon?
- Arm Interaction point safety checks
- Trains no longer briefly derail when moving through portals
- Players are now less likely to get stuck in the original dimension when traversing train portals
- Trains no longer track coupling stress between carriages that are currently in different dimensions
- Fixed quark closing double doors when opened (+temporary workaround for 1.18)
- Boilers made of creative fluid tanks now provide a max level water supply
- Crafter ponder scene no longer uses an outdated recipe
- Reduced steam release effect of bogeys that haven't travelled far since the last stop
2022-07-11 19:28:25 +02:00
Jozufozu
f03bf9839c A pulley good day
- Fix crash when moving pulleys on a contraption
 - Bump forge and parchment versions
 - Bump flywheel version
2022-07-10 15:44:15 -04:00
PepperCode1
954f098cd1 Tiny goggles
- Fix goggles on smouldering blaze burner
- Shrink normal blaze goggles model
- Add new arm targets to ponder tag
- Update Registrate and Forge
2022-07-08 18:34:27 -07:00
Jozufozu
dc20f7091c Mopping up
- Fixes contraption world leak twofold.
 - Bump flywheel - 0.6.3.81
2022-06-22 13:44:34 -07:00
Jozufozu
3d8fdc69de A little back and forth
- Clean up the revert
2022-06-20 09:23:54 -07:00
Jozufozu
86dd1cd624 Revert "Material refactor pt 1"
This reverts commit 343c0fab
2022-06-20 09:17:51 -07:00
simibubi
841bf3f350 Merge branch 'mc1.18/dev' into mc1.18/global-railways 2022-05-22 18:10:40 +02:00
simibubi
329be0d948 Switch to forge RB 2022-05-22 17:34:18 +02:00
patryk3211
5a747ce93c Added support for wearing goggles on curios head slot 2022-05-10 14:51:38 +02:00
Jozufozu
343c0fab62 Material refactor pt 1
- PartialModels don't actually need reference states, use air instead
 - Bump flywheel build
2022-04-10 17:37:45 -07:00
Jozufozu
46ec1dd697 Looking things over
- Minor code cleanup
 - Bump flywheel build
2022-04-08 17:34:17 -07:00
simibubi
723e989ac5 Merge branch 'mc1.18/dev' into mc1.18/global-railways 2022-04-08 02:10:53 +02:00
Jozufozu
d7b63fd6f2 Spinning up the wheel
- Bump flywheel build - 0.6.2.65
2022-04-07 14:28:13 -07:00
PepperCode1
3c87044dc5 Super empty fluid
- Fix NPE with hose pulley
- Update Forge and Registrate
2022-03-30 17:44:16 -07:00
simibubi
273a276fda Version bump 2022-03-23 20:02:36 +01:00
simibubi
727b0a463e Damage Control
- Updated dependencies to 1.18.2
- Started work on compilation errors
2022-03-21 02:38:03 +01:00
simibubi
a8c368f426 Patch F
- Fixed Create's JEI plugin not reloading recipes properly
- Reverted an AT that seems to cause issues with compiling in IDEs
- Fixed Contraption disassembly causing inventory contents to be rolled back
- Fixed Crushing Wheels not working correctly
- Items idling on top of Crushing Wheels are no longer prevented from being picked up by players
- Fixed automated compatibility picking up custom recipes from the mod "occultism"
2022-03-21 00:29:45 +01:00
simibubi
0b17aab01e Patch E Prep 2022-03-12 20:31:12 +01:00
PepperCode1
2211632f5c Just enough brewing
- Optimize CreateJEI recipe list construction
- Optimize PotionMixingRecipes
- Add basic modded brewing recipe compatibility
- Fix dyed sails not being placed when printing schematics
- Fix sideways belts not being placed correctly when printing schematics
- Fix MechanicalCraftingCategory not applying the model matrix
- Add Upgrade Aquatic compatible fertilizer recipes; Resolve #658
- Replace almost all reflection with access transformers or accessor
mixins
- Remove duplicate sails tag
- Improve metal compatibility
- Switch to a linked set in StringSerializableTrigger to prevent
inconsistent generation of aesthetics.json
- Other minor changes
2022-03-12 00:04:05 -08:00
PepperCode1
fa4a0e7261 Limiting the infinite
- Add new config and tags for better control over infinite draining
behaviour
- Pipes spilling water will now extinguish entities and fires; pipes
spilling lava will now set entities on fire
- Fix some bugs and inconvenient behavior with the config menus
- Fix fluids destroying crushing wheel controllers
- Fix crushing wheel controller using output direction instead of input
direction at times
- Rename blaze burner fuel tags
- Improve GhostBlockRenderer
- Organize imports
- Update Forge
2022-03-05 01:45:39 -08:00
PepperCode1
0cf0d3930e Shuffling the shade
- Update Flywheel and add support for unshaded quads
- Fix models marking shafts and other parts as unshaded
- Refactor SchematicRenderer buffer building
- Improve block entity render bounding box caching
- Fix #2785
2022-02-19 21:42:40 -08:00
Jozufozu
984cde4d43 Move diffuse declaration to vertex compiler 2022-02-15 18:02:25 -08:00
PepperCode1
160e823282 JEI and glowing fixes
- Fix sequenced assembly scene in newer JEI versions; Fix #2779
- Fix inconsistent JEI fan scenes; Fix #2748
- Fix glowing RenderTypes not respecting lightmap values
2022-02-13 14:04:52 -08:00
PepperCode1
3aa0644426 Diffuse fixes II
- Add ForcedDiffuseState to push/pop forced diffuse calculators
- Transform the SBB instead of the global PoseStack when applying ponder
transforms
- Tweak used shaders in RenderTypes
- Rename LerpedFloat.Interpolater to Interpolator
- Update Flywheel
2022-02-12 21:15:41 -08:00
PepperCode1
99e94f7c6e Update Flywheel + diffuse fixes
- Fix ponder diffuse when using shaders
- Partially fix incorrect diffuse formula being used in the nether
- Invalidate schematic renderers at the appropriate time
2022-02-08 20:58:13 -08:00
PepperCode1
d71b10cf72 Update to Flywheel 0.6.1
- Make SchematicWorld use plains instead of forest biome
2022-02-02 21:43:23 -08:00
Jozufozu
746d9867db Client only flywheel
- Mark off everything using PartialModel or ContraptionLighter as client-only
 - Likely needs more testing
2022-01-24 13:41:34 -08:00
simibubi
65e6c24c32 Maintenance Day
- Bump forge
- Mechanical Harvester no longer crashes the game on newer forge versions
- Fixed Cocoa Beans being harvested too early
- Fixed incompatibility with Abnormals' custom tree types
- Fixed incompatibility with Serene Seasons
- Fixed incompatibility with Terralith
- Added a couple of Raw Ore compatibility recipes
2022-01-24 16:40:30 +01:00
Jozufozu
6fd1e2cc63 Shader sanity branch cleanup
- Disable FlwContraption rendering while using batching engine
 - Bump flywheel build/version
2022-01-17 18:46:44 -08:00
Jozufozu
33d0f8c352 Fix crash rendering contraption with batching engine 2022-01-17 16:27:00 -08:00
simibubi
cf1eac3edd Fixed javadoc failing the build 2022-01-09 15:54:50 +01:00
Jozufozu
1e3fd9087e Bump flywheel build - 0.5.1.44
- Fixes gl error spam on intel
2022-01-08 16:58:03 -08:00
Jozufozu
e6914b1a6f Fix crash rendering biome-tinted blocks on contraptions
- Biome colors now line up with the world
2022-01-07 14:22:31 -08:00
Jozufozu
0ff67382ee Fix visual artifacts with contraptions while using opfine.
- Fix darkening of tile entities while using shaders

I think the buffers from the shadow pass were bleeding into the color pass.
2022-01-06 13:05:29 -08:00
Jozufozu
5910ad5a03 Move Belt LightListener to inner class 2022-01-04 14:22:58 -08:00
PepperCode1
c8ba7b88cc Update to Flywheel 0.5.1 2022-01-03 23:52:36 -08:00
simibubi
8e4dcb958d Stonehedge
- Fixed Harvesters hard-colliding with leaves when used with pistons, pulleys or a gantry carriage
- Fixed kinetic tiles not marking chunks for saving when speed or stress changes
- Dedicated Servers no longer create a resourcepack folder
2021-12-28 13:04:22 +01:00
Jozufozu
ffeecfdce0 Go through GlVertexArray
- VAO state is now handled by GlVertexArray objects
 - IndexedModel no longer inherits from VBOModel
 - BufferedModel doesn't need #clearState
 - Likely fixes crash on intel drivers
2021-12-27 19:16:06 -08:00
Jozufozu
150158d7be Merge branch 'The-Vowels/mc1.18/dev' into mc1.18/dev
# Conflicts:
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java
#	src/main/java/com/simibubi/create/foundation/utility/worldWrappers/PlacementSimulationWorld.java
#	src/main/java/com/simibubi/create/foundation/utility/worldWrappers/chunk/WrappedChunk.java
2021-12-26 15:43:55 -08:00
Jozufozu
d98a07736c No more diffuse divide
- Move PlacementSimulationWorld to Flywheel as VirtualRenderWorld
 - Simplify ModelTransformer
 - Model doesn't need #configure
 - Bump Flywheel build
2021-12-25 15:56:15 -08:00
Jozufozu
714b926ee3 Bump Flywheel build - 0.5.0.28 2021-12-24 16:35:53 -08:00
Jozufozu
ac3c9aa3bb Switch back to parchment, update forge 2021-12-23 23:09:51 -08:00
PepperCode1
7942b570f0 Brackets, models, and reload listeners
- Fix bracket contraption rotation; Fix #1856
- Make sure KineticTileEntityRenderer only renders once
- Make use of new ModelUtil method in BakedModelRenderHelper
- Clear up BracketedKineticBlockModel and PipeAttachmentModel logic
- Replace ISimpleReloadListener usage with ResourceManagerReloadListener
2021-12-21 13:44:00 -08:00
Jozufozu
34aa336683 Update flywheel - 0.4.2-rc.25 2021-12-15 16:57:13 -08:00
Jozufozu
6887031ca4 Update forge - 39.0.5 2021-12-15 15:08:07 -08:00
simibubi
257767cbec Version up! 2021-12-13 08:20:16 +01:00
Jozufozu
1e9c94303e Bump flywheel build 2021-12-11 17:35:06 -08:00
PepperBell
080b048b2f SmarterTileEntity
- Clean up SyncedTileEntity and SmartTileEntity
- Allow schematicannons to be rotated based on placement angle
- Fix DirectionalExtenderScrollOptionSlot rotation
- Remove deprecated usage of JsonReader and LazyLoadedValue
- Move ToolSelectionScreen to content.schematics.client
- Organize imports
- Update to 1.18.1
2021-12-10 16:58:05 -08:00
Jozufozu
2efbcdbd6b No more material spec, everything is StructType 2021-12-09 16:42:13 -08:00
Jozufozu
ef5afd42c3 Move api package 2021-12-09 15:32:55 -08:00
Jozufozu
1a3f27abc8 Reorganize, rename, refactor, 0.4.0
- Move most user facing interfaces to flywheel.api package
 - Refactor InstanceData to have no package private classes
 - Remove 'I' prefix from many interfaces
 - ILightUpdateListener -> LightListener
 - IMultiProgram -> ContextAwareProgram
 - IFlatLight -> FlatLit
 - All materials use the same vertex format: UNLIT_MODEL
2021-12-09 00:44:43 -08:00
Jozufozu
35bfa8a15c #tick and #beginFrame on creation
- Fixes weird delay in object appearance when reloading chunks
2021-12-08 12:30:08 -08:00
Jozufozu
4041897d29 Groups store their types again
- Fix crash rendering breaking overlay
2021-12-08 12:28:38 -08:00
Jozufozu
a3476fd54c Keeping up
- Contraptions always use ArrayModelRenderer
 - De-duplicate UI framebuffer swapping code
 - Unbind VAO between contraption structure drawing and engine drawing
 - Bump flywheel build
2021-12-07 23:15:09 -08:00
simibubi
061b85d515 New version who dis?
- Port to 1.18
- ChunkUtil discontinued
- SmartTileEntities write to metadata
- Features generate from -64 up
- World Wrappers weren't convoluted enough
- Haunted bell considers >0 safe
- Missing GuiUtils methods continued in RemovedGuiUtils
2021-12-07 18:24:57 +01:00
Jozufozu
ffe670b391 Vanillaization
- IModels now accept a VertexConsumer
 - IRenderState -> RenderType
 - AbstractInstancer for dealing with InstanceData tidyness
 - Bump flywheel version
2021-12-06 15:36:47 -08:00
Jozufozu
117b5a93a3 No more InstanceData#write 2021-12-02 21:25:32 -08:00
Jozufozu
85b1b86883 Unsafe writers for StructTypes
- Bump flywheel build
2021-12-02 19:32:40 -08:00
Jozufozu
2bde87af33 haunted gradle
- Update forge
 - Add Flywheel to the runs when using Create/Flywheel gradle workspace
 - Fix weird intellij issues with mixin's annotation processor
2021-12-02 14:02:00 -08:00
PepperBell
1fdf1ff7e9 Destroyed and deprecated
- Fix rotation indicator particles
- Fix sail dyeing
- Turn BreakProgressHook into DestroyProgressRenderingHandler interface
- Refactor overlay rendering to properly use API
- Change SpriteShiftEntry to use StitchedSprites
- Use OnDatapackSyncEvent instead of mixin
- Organize foundation.ponder package
- Remove usage of deprecated:
-   Durability bar methods
-   Constants class
2021-11-27 14:49:43 -08:00
Jozufozu
7a4ed99fb5 Bump flywheel build
- New project slug
 - StitchedSprite changes
2021-11-27 12:46:01 -08:00
Jozufozu
028ac4bbda Transform stack changes
- Add ToolBoxInstance
 - Move from MatrixTransformStack to TransformStack.cast where possible
 - SuperByteBuffer implements transform traits on its own
 - Bump flywheel build
2021-11-23 18:16:57 -08:00
PepperBell
d15b2281c1 Update Registrate 2021-11-20 09:04:55 -08:00
PepperBell
1e90f84875 Update dependencies
- Gradle: 7.2 -> 7.3
- Forge: 37.0.104 -> 37.0.108
- JEI: 8.1.0.31 -> 8.2.0.34
2021-11-12 11:01:27 -08:00
Jozufozu
e8cddfdfea Fix textures on contraptions
- bump flywheel build
2021-11-09 16:53:52 -08:00
Jozufozu
9597d8832f Bump flywheel build 2021-11-09 15:07:29 -08:00
simibubi
bea8cea59d Get building
- Fixed super glue not spawning particles on break
- Fixed logspam when goggle overlays are shown
- Fixed blocks launched by a schematicannon spiraling through the air
- Fixed javadoc errors
2021-11-07 20:58:46 +01:00
PepperBell
3611068e00 Switch to Parchment mappings 2021-11-02 19:30:02 -07:00
PepperBell
0cb7a0260e Chipping away 2021-11-01 22:18:30 -07:00
simibubi
741fa401d8 Move to official class names
- also updated buildscript to 1.17
- some remap corruption from compilation errors in flw/next
2021-11-02 00:08:20 +01:00
simibubi
2db2892033 Not client enough
- bump version
- actually fix ISTER dist issue
2021-10-23 03:50:49 +02:00
simibubi
925c98792f (Sp)out of order
- Added behavioural registry for Spout/Block interaction
- Fixed and Refactored TiCon Casting via Spout
- Fixed fluid pipes getting stuck trying to waterlog non-solid blocks with fluid handling capabilities
- Fixed modlist lookup for non-english locales
2021-08-25 13:46:53 +02:00
Jozufozu
26fbe97ae6 Fix contraption shadow rendering with optifine
- More conventional naming for fields of ContraptionMatrices
 - Encapsulate fields in ContraptionMatrices
 - Move creation to RenderLayerEvent
 - De-clutter RenderedContraption#beginFrame
 - Bump flywheel version
2021-08-05 15:09:00 -07:00
Jozufozu
3e6e8c406b Bump Flywheel version
- Small tweak to contraption layer creation
2021-08-05 15:09:00 -07:00
simibubi
8dd2f1dbf6 Schematic Problematic
- Fixed ammo-specific fire damage not dropping cooked drops from killed entities
- Fixed Schematicannons not visually aiming toward current block trajectory
- Fixed placed Schematics using smaller boundaries than the original
- Added the option to enable/disable placing air blocks with instant creative schematic printing
- Added safety check for Missing/Migrated filter attributes #2065
- Added safety check for Crushing wheels near unloaded blocks
- Added safety check for instant printing an invalid Schematic
2021-08-05 17:05:13 +02:00
PepperBell
5862e01981 Update Registrate, Flywheel, and JEI 2021-07-30 12:48:38 -07:00
PepperBell
0d7f486107 Update fluids
- Update Registrate from 1.0.4 to 1.0.9
- Remove unnecessary manual bucket creation in fluid builders
- Set more realistic fluid viscosities; Fix #2010
2021-07-29 18:49:04 -07:00
Jozufozu
e1248e598a Model changes
- Buffered models directly consume IModels
 - Document IModel more
 - Move contraption world render spoofing to flywheel
 - Miscellaneous new RenderMaths
 - Added WorldModel, renders many blocks given a world instance
 - Fix broken transparency on contraptions when using Flywheel
2021-07-29 01:37:48 -07: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
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
Jozufozu
6a97a31297 Bump flywheel version 2021-07-23 23:54:42 -07:00
PepperBell
37261ee8e6 Update Forge
- Bump minimum required Forge version to 36.2.0
- Re-add chorus teleport event compatibility
- Update Flywheel, JEI, and Shade plugin
2021-07-22 14:16:00 -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
5610f63375 no more outdated gradle 2021-07-15 11:53:08 +02:00
Jozufozu
a8bdf710fa Bump flywheel version 2021-07-14 15:56:44 -07: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