Commit graph

2603 commits

Author SHA1 Message Date
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
939b276c56 Patch the Patch
- Bugfixes to recently added/changed functionality
2022-03-12 22:27:33 +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
mezz
fcec6566fa
Improve the performance of MechanicalPressTileEntity#canCompress 2022-03-07 17:27:26 -10: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
simibubi
97ea78e852 Post-PR Datagen 2022-03-03 18:10:35 +01:00
qkrehf2
bfab1d30c2
Updates to ko_kr.json by qkrehf2 (#2805) 2022-03-03 17:52:12 +01:00
CKenJa
cef481653e
Updates to ja_jp.json by CKenJa (#2780) 2022-03-03 17:42:00 +01:00
璀境石
6315749cf6
Updates to zh_cn.json by Demonese (#2717) 2022-03-03 17:40:05 +01:00
vyhi
50bc6f49e4
Updates to pt_br.json by vyhi (#2598) 2022-03-03 17:38:30 +01:00
muriplz
e69732f818
Updates to es_es.json by muriplz (#2523) 2022-03-03 17:35:45 +01:00
simibubi
2a3aa5955b
Merge pull request #2745 from FortressNebula/mc1.18/dev
Change the way CopperBlockSet generates block models + condition support for Mech. Crafting
2022-03-03 17:27:38 +01:00
simibubi
9aa1611d78
Merge pull request #2670 from rsaihe/mc1.18/dev
Improve consistency in advancement texts
2022-03-03 17:20:49 +01:00
simibubi
d522ec70a3
Merge pull request #2788 from jaredlll08/mc1.18/dev
Fixed using ShapedRecipe instead of IShapedRecipe and restrictive shapeless check.
2022-03-03 17:19:23 +01:00
simibubi
e7a273e678 Tunnel touch-ups
- Fixed some of the kinetic item models not using the updated cogwheel uvs
- Fixed inconsistent uv scaling on belt tunnel assets
- Removed one of the textured seams visible on tunnel sides
2022-03-03 17:18:53 +01:00
simibubi
596802d3cc Phantom Slots
- Corrected DeployerItemHandler to reserve slots for overflow items
- Fixed Deployer not allowing overflow items to be extracted in some cases
2022-03-03 15:42:00 +01:00
simibubi
21ad6125f5
Merge pull request #2597 from lcy0x1/funnel-fix
- Fixed backlog on belts not actively extracted by funnels that were blocked while the items accumulated
2022-03-03 15:07:32 +01:00
simibubi
ccd4833148 Splash of Smoke
- Removed nbt side-effects of the fan processing recipe check for ground items
- Fixes intersecting fan streams making passing ground items unable to be processed
2022-03-03 14:51:27 +01:00
PepperCode1
6420f54194 Add tags for blaze burner fuel
- `#create:blaze_burner_regular_fuel`: these items are treated like coal
by the blaze burner if they cannot be used as fuel in a furnace
- `#create:blaze_burner_special_fuel`: these items cause the blaze
burner to become superheated
- Fix equipable item attribute
- Fix SandPaperItem overriding both getItemEnchantability and
getEnchantmentValue
2022-02-24 17:32:33 -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
Jared
51197d2034
Fix mechanical mixer not working for all non shaped recipes. Fixes #1424 2022-02-15 05:17:31 +02:00
Jared
379c243133
Fixed non ShapedRecipe / ShapelessRecipe recipes not being shown in JEI.
Fixes #1112
2022-02-15 05:15:56 +02:00
PepperCode1
ed4a371fa0 Shootable glow berries
- Add glow berries as a potato cannon projectile type; Closes #2406
2022-02-13 14:41:09 -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
FortressNebula
219cf455c3 Revert "Revert "Add condition support for mechanical crafting recipes""
This reverts commit 0220b32faf.
2022-02-12 12:31:19 +00:00
FortressNebula
0220b32faf Revert "Add condition support for mechanical crafting recipes"
This reverts commit c23cbbb4be.
2022-02-12 12:28:26 +00:00
FortressNebula
c23cbbb4be Add condition support for mechanical crafting recipes
- Copied over the condition functions from ProcessingRecipeBuilder
- Added recipeConditions variable
- Copied over json section for dealing with conditions from ProcessingRecipeBuilder
2022-02-12 12:27:30 +00: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
3c71e8041b Remove unnecessary code
- Remove block vertex color code
- Remove experimentalRendering config
- Move as much Item.Properties configuration to AllItems as possible
2022-02-06 12:22:43 -08:00
Jozufozu
9c42988135 Portable clipping interface
- Fix PSI z-fighting
2022-02-05 12:43:28 -08:00
FortressNebula
f86149b66a Change the way CopperBlockSet generates block models
- If the specified name and end texture name are equal, then generate a cube_all model instead. Purely for neatness' sake.
2022-02-03 20:18:27 +00:00
PepperCode1
00555ff572 Bump Flywheel version dependency 2022-02-02 21:45:47 -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
simibubi
2a4cfef7a8 Cannot empty this
- Fixed crash when water cauldrons are loaded as part of a schematic
2022-01-25 21:33:40 +01:00
simibubi
30a026ab0c Patch D
- Safety check for schematicannon entities
- Some tagging
2022-01-25 18:58:37 +01: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
3a8a0fa9e1
Update mods.toml 2022-01-24 17:03:06 +01: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
Amelia Clarke
1129b04843
Improve consistency in advancement texts
This commit fixes issues with inconsistent capitalization in advancement
names and descriptions. It also fixes miscellaneous other minor typos
and inconsistencies.
2022-01-21 18:36:08 -06:00
FortressNebula
91775aff41 Allow copper block set to use different root directories
CopperBlockSet has many useful functionalities that addons could use for their own metals that also oxidize. It'd be nicer and more intuitive for anyone going through our github, however, if they could be in their own separate directory.
2022-01-19 19:14:34 +00: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
d3bbeb5a7a Reorganize and simplify
- Remove AllMaterialSpecs#flwInit
2022-01-17 16:42:24 -08:00
Jozufozu
74a147db30 Remove "states" field from program jsons 2022-01-17 16:42:24 -08:00
Jozufozu
88d8d24663 Separate vertex and fragment shaders and templates 2022-01-17 16:42:24 -08:00
Jozufozu
9f64ae4e9a Almost sane shaders
- No more ShaderContext. Programs are directly retrieved through ProgramCompilers.
 - Templates don't need generics
 - Remove ExtensibleGlProgram
2022-01-17 16:42:24 -08:00
Jozufozu
2856594cc8 Pass RenderLayer into contraption structure context 2022-01-17 16:42:23 -08:00
Jozufozu
0b25335f8e Compile everything on the fly 2022-01-17 16:42:23 -08:00
Jozufozu
2b6348855a Shader sanity
- Keeping up with Flywheel changes
2022-01-17 16:42:23 -08:00
Jozufozu
33d0f8c352 Fix crash rendering contraption with batching engine 2022-01-17 16:27:00 -08:00
Jozufozu
6a189458ac Fix visual artifacts and gl log spam with contraptions and batching engine 2022-01-13 13:35:15 -08:00
PepperCode1
d0a660c0ae Virtual rendering fixes
- Fix blocks in schematic renders being too dark
- Fix shafts and cogs fired from a schematicannon not rendering
2022-01-11 20:15:33 -08:00
Jozufozu
541e5bd6ae Fix crash extending belts 2022-01-11 13:43:04 -08:00
lcy0x1
f0305d7027 check funnel first to fix bug 2022-01-09 18:02:21 -08:00
PepperCode1
a666f24ee0 Souls and flames
- Fix lit soul blaze burner providing smoking instead of haunting
- Fix horses displaying soul particles even when not being haunted
- Add hauntable item attribute
- Re-add right clicking lit blaze burner with shovel to extinguish it
- Move most fan type functionality to abstract methods in the enum
constant
- Rework FurnaceEngineModifiers
2022-01-09 14:00:55 -08:00
simibubi
04c76bb6f0 The meaning of null
- Fixed Client-side TileEntities ignoring data packets with empty compound tags
- Fixed Stickers not visually updating when powered
- Fixed Cocoa pods colliding with piston/pulley/gantry harvesters
- Fixed Bulk Smoking using Haunting particles
- Unified particle emission locations between depot and belt fan processing
- Updated Haunting recipes
2022-01-09 20:06:04 +01:00
Gabriel Aguiar
b4641675f1
Added pt_pt.json by fgsoftware1 (#2593) 2022-01-09 20:02:03 +01:00
simibubi
cf1eac3edd Fixed javadoc failing the build 2022-01-09 15:54:50 +01:00
simibubi
4aa44f1a3a Misc Patches
- Fixed Brass funnels with configured amounts inserting partial stacks when target inventory is almost full #2589
- Fixed toolbox not marking a chunk for saving when contents change #2574
- Fixed Contraptions no longer sending disassembly packets and thus dropping players through blocks #2538
2022-01-09 15:42:01 +01:00
simibubi
676beab44b
Merge pull request #2587 from shartte/patch-1
- Fixed Item Drain recipes in JEI marking the fluid as an input
2022-01-09 13:25:22 +01:00
simibubi
236b4004fc Glurability
- Fixed Super Glue not showing a correct damage bar
2022-01-09 02:39:24 +01:00
shartte
d906940b95
Fix Output-Flag for Emptied Fluid in JEI
The category for EmptyingRecipe in JEI marks the fluid slot as an input slot, confusing JEI recipe transfer handlers (like AE2).
2022-01-09 01:32:07 +01:00
simibubi
6dceee2478 Adjustments 2022-01-08 15:34:03 +01:00
simibubi
8a99a08d7c Merge branch 'mc1.18/dev' into pr/2503 2022-01-08 14:33:33 +01:00
simibubi
41f36d5176 Post-PR datagen 2022-01-08 14:17:00 +01:00
qkrehf2
535ef6a9a8
Updates to ko_kr.json by qkrehf2 (#2488) 2022-01-08 14:05:53 +01:00
璀境石
8cc5db44c5
Updates to zh_cn.json by Demonese (#2450) 2022-01-08 14:04:36 +01:00
CKenJa
a502750a18
Updates to ja_jp.json by CKenJa (#2423) 2022-01-08 14:03:13 +01:00
vyhi
77eef2ab7c
Updates to pt_br.json by vyhi (#2420) 2022-01-08 14:02:08 +01:00
simibubi
6d7ad08518
Update Localization Readme.txt 2022-01-08 13:57:21 +01:00
simibubi
96c5480dee
Merge pull request #2499 from git-async/mc1.18/dev
- Fixed Stockpile Switch prioritizing item inventories over fluid inventories
2022-01-08 13:52:59 +01:00
simibubi
b75c844adb
Merge pull request #2529 from mrh0/furnaceEngineChanges
- Addons are now able to register non-furnace blocks as valid sources of a furnace engines' power
2022-01-08 13:45:14 +01: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
2cdbdfa218 Towards client-only flywheel
- Fix nullpointer with belt lighter
 - Remove references to GridAlignedBB and ImmutableBox in Contraption
2022-01-05 11:12:26 -08:00
Jozufozu
5910ad5a03 Move Belt LightListener to inner class 2022-01-04 14:22:58 -08:00
Jozufozu
5f81b31fe4 More Instancers 2022-01-04 14:11:11 -08:00
PepperCode1
c8ba7b88cc Update to Flywheel 0.5.1 2022-01-03 23:52:36 -08:00
PepperCode1
cf3dac6ad0 Prevent loading connected textures on server
- Wrap ConnectedTextureBehaviour and AllSpriteShifts instances in
Suppliers where necessary
- Use client connection's instead of level's RecipeManager when finding
recipes for JEI
- Add missing override annotations in SymmetryEffectPacket
- Organize imports
2022-01-03 15:23:42 -08:00
MRH0
67d2d12c9b Update FurnaceEngineModifiers.java 2021-12-31 17:32:14 +01:00
MRH0
2f35b76f1a Update FurnaceEngineModifiers.java 2021-12-31 16:34:48 +01:00
MRH0
6107b939a5 cleanup 2021-12-31 16:29:22 +01:00
MRH0
8145014847 Disconnecting the Furnace Engine from AbstractFurnaceBlock
Adds the abillity to register any block as a power source to the furnace engine. This will allow for more flexability and remove the need to implement AbstractFurnaceBlock and AbstractFurnaceBlockEntity.
2021-12-31 03:17:56 +01:00
Aeiou
345b83ee90 Improve comment clarity on height-related methods in ContraptionWorld and WrappedWorld 2021-12-30 15:32:55 -05:00
Aeiou
a12708b336 big brain fix c: 2021-12-30 13:51:48 -05:00
simibubi
3deb23303d Moss, Paper, Scissors
- Dripstone and Lush Caves can now replace exposed create stone types with their own generated blocks
2021-12-28 13:48:30 +01: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
Aeiou
658f5125e0 Merge remote-tracking branch 'upstream/mc1.18/dev' into mc1.18/dev
# Conflicts:
#	src/main/java/com/simibubi/create/foundation/utility/worldWrappers/PlacementSimulationWorld.java
2021-12-24 21:41:27 -05:00
Jozufozu
714b926ee3 Bump Flywheel build - 0.5.0.28 2021-12-24 16:35:53 -08:00
Jozufozu
0a4311b51e Contraptions and engines
- Sort of get the batching engine working for contraptions but this feels wrong
 - TaskEngine gets passed in methods
 - Better naming for TaskEngines
 - Do BufferSource ourselves
 - Change BufferBuilderMixin to allow for injection into BufferBuilder objects
2021-12-23 23:22:53 -08:00
lcy0x1
6327aad3f6 add netherrack farming machine (harsh recipe) 2021-12-23 21:15:08 -05:00
git-async
2d095995e4
Fix Stockpile Switch prioritizing item inventories 2021-12-23 17:38:02 -05:00
lcy0x1
edd5bafee4 add soul smoking and some simple recipe 2021-12-23 15:37:03 -05:00
Jozufozu
3cb84a5db5 Merge branch 'mc1.18/flwbatching' into mc1.18/dev 2021-12-22 22:06:07 -08:00