Commit Graph

2679 Commits

Author SHA1 Message Date
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
22af1604b4
Merge pull request #2770 from AeiouEnigma/patch-1
Update bug_report.yml
2022-02-11 09:42:20 -08:00
Aeiou
0d5695236e
Update bug_report.yml
Add "0.4.0d" to Mod Version options list
2022-02-09 16:53:06 -05: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
Jozufozu
8f9be09fe1
Merge pull request #2662 from The-Vowels/mc1.18/dev
Update bug_report.yml
2022-01-20 14:56:21 -08:00
Aeiou
cbf889c762
Update bug_report.yml
Add 0.4.0c to version options list
2022-01-20 17:51:37 -05:00
PepperCode1
b59092ec77
Merge pull request #2651 from FortressNebula/mc1.18/dev
Allow CopperBlockSet to use different root directories
2022-01-19 11:33:51 -08: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