Commit graph

3581 commits

Author SHA1 Message Date
simibubi
6902aa007a Use cutout buffer mixer rendering 2023-03-03 00:33:45 +01:00
simibubi
00e733e608 Meeting notes
- Can now use trapdoors with copycat panels
- Copycat bars are less likely to cause zfighting
- Fixed waterwheels not updating flow score in some edge cases
- Metal Scaffolding no longer zfights with adjacent non-solid blocks
- Boiler status now highlights information about water flow when insufficient
2023-03-02 12:43:08 +01:00
simibubi
c4505b657b Merge fix-ups 2023-03-01 22:09:42 +01:00
simibubi
dde9ad280b Merge branch 'mc1.18/0.5.1' into mc1.18/0.5.1-repolish 2023-03-01 21:52:11 +01:00
simibubi
ad134f135a Small what are wheels?
- Implement new water wheel asset
- Increased water flow no longer has any benefits. Both wheels have only one power level each
2023-03-01 21:43:40 +01:00
PepperCode1
bc0f349840 Simplify packet handling
- SimplePacketBase#handle now accepts Context instead of
Supplier<Context>
- SimplePacketBase#handle now returns boolean, which, if true, calls
Context#setPacketHandled(true)
2023-03-01 11:21:17 -08:00
simibubi
ac182991f4 In World in Style
- Overhauled UX of scroll values and item filtering
- Filtered item extraction can now be configured to pull "up to x items" per operation
- Removed some unused assets
2023-03-01 18:45:25 +01:00
simibubi
4924dfda5d Bad merge
- Fixed layout of netherite armour textures on this branch
- Fixed elevator pulley magnet not rotating with the blockstate
2023-02-26 16:12:04 +01:00
simibubi
f9c2cdb5f7 Regenerate data cache 2023-02-25 14:39:01 +01:00
simibubi
f648881987 Merge leftovers 2023-02-25 14:32:51 +01:00
simibubi
d5db85df79 Merge branch 'mc1.18/0.5.1' into mc1.18/0.5.1-trackworks 2023-02-25 14:28:12 +01:00
simibubi
68eccd1d51 Don't open sesame
- Added door controls to elevator contact and train station UI
2023-02-25 14:15:31 +01:00
simibubi
f6f501812e Merge branch 'mc1.18/0.5.1-copycat-variants' into mc1.18/0.5.1-repolish 2023-02-25 03:59:41 +01:00
simibubi
55c314f6dc The full spectrum
- Water wheel material lookup supports any reasonably implemented wood type
- Water wheel items use spruce
- Cleanup mtls
2023-02-25 03:59:24 +01:00
PepperCode1
9271edf298 Wheels are rendered
- Add water wheel rendering
- Use NbtUtils to read block states in CopycatBlockEntity and
WaterWheelBlockEntity
2023-02-24 18:08:31 -08:00
simibubi
77c0c14780 Catch up with renames II 2023-02-25 01:47:03 +01:00
simibubi
a5e19ee0e5 Merge branch 'mc1.18/0.5.1-repolish' into mc1.18/0.5.1-copycat-variants 2023-02-25 01:46:29 +01:00
simibubi
425054e00a Copybara
- Fixed inside faces of scaffolds not using the correct textures
- Fixed inside faces of scaffolds not connecting
- Copycat panels now accept iron bars and modded instances of it
- Added andesite, brass and copper bars (textures to be replaced)
2023-02-25 01:32:44 +01:00
simibubi
3756ced16b Use x_log_top in Water Wheels 2023-02-25 00:36:26 +01:00
simibubi
a9f041a136 Catch up with renames 2023-02-24 22:34:52 +01:00
simibubi
51e3aadd34 Merge branch 'mc1.18/0.5.1' into mc1.18/0.5.1-repolish 2023-02-24 22:29:10 +01:00
simibubi
a3e7dd5ced Merge leftovers 2023-02-24 22:10:57 +01:00
simibubi
a75e3af0b0 Merge branch 'mc1.18/dev' into mc1.18/0.5.1 2023-02-24 22:10:33 +01:00
PepperCode1
42675f9511 Clean up and optimize copycat models
- Rename ITransformableTE -> ITransformableBlockEntity
2023-02-24 12:37:41 -08:00
PepperCode1
783cd126f7 Renaming and getters
- Rename AllBlockPartials -> AllPartialModels
- Make AllPackets.channel private and use getter method instead
- Make config fields in AllConfigs private and use getter methods
instead
- Optimize SyncedBlockEntity#sendData
2023-02-23 16:05:22 -08:00
simibubi
70964165d5 What are wheels?
- Added the Large Water Wheel
- Water wheel fins are no longer directional
- Water wheels now only have two speed levels
- Liquid can no longer spread perpendicularly on top of water wheels (experimental)
- New crushing wheel model
2023-02-24 00:36:35 +01:00
PepperCode1
6265b6d295 Refactor custom rendered items
- CustomRenderedItemModel no longer holds partials
- Store partials as PartialModels in static fields in renderers
- Remove all CustomRenderedItemModel subclasses
- Remove CustomRenderedItemModelRenderer#createModel
- CustomRenderedItemModelRenderer is no longer generic
- Store items with custom renderers in CustomRenderedItems instead of
CustomRenderedItemModelRenderer
2023-02-22 20:34:37 -08:00
PepperCode1
e54ccb853a Use more generics in BE renderer and instance subclasses
- This makes it unnecessary to cast or store the passed BE in BE
renderers and instances
2023-02-22 14:45:06 -08:00
Cyvack
c907454be9
Overhaul to how encasing blocks works (#4458)
* Make Encasing utilize Interfaces

* Add Javadoc to IEncasable and IEncased interfaces

* Fix Weird block.block issues (No clue where those came from)

* Final Touch ups for now and made requirement for casing normal Block instead of CasingBlock

* Make requested changes

* Add more parameters for tryEncasing, for use in handleEncasing
Move handleEncasing to Encased Interface for more flexability

* Simplify and organize

- Rename:
  - Encasable -> EncasableBlock
  - Encased -> EncasedBlock
  - EncasableRegistry -> EncasingRegistry
- Remove EncasedBlock#setCasing
- Remove encasedBlock argument from EncasedBlock#handleEncasing
- Add Registrate builder transformer to EncasingRegistry for easy use

---------

Co-authored-by: PepperCode1 <44146161+PepperCode1@users.noreply.github.com>
2023-02-22 13:09:11 -08:00
simibubi
0ad875bb74 Cull me maybe
- Improved face occlusion for scaffolds
2023-02-22 16:58:12 +01:00
simibubi
3c1523d165 On a Roll
- Added a movement actor for easier track clearing and paving
2023-02-22 15:14:04 +01:00
EdrowsLuo
3ed3fe5a09 Fix crash when SchematicannonTileEntity try to parse state using empty string 2023-02-21 14:59:46 +08:00
simibubi
0dd8c3a4f1 Actually Tilted
- Unsightly amendments to the track graph for a smoother ride
2023-02-17 15:41:18 +01:00
DaComputerNerd
6b0af48e99 Add track merge event
Can't test it due to java shenanigans, but I think this will work.

It's worth noting that this will only be specific to merging as long as transferAll is. If anything else ends up using transferAll, all that needs to happen is adding an intermediate method that posts the event instead of transferAll doing it, then calls transferAll
2023-02-10 10:32:15 -05:00
simibubi
40f96b0038 You wrenched this? I wrenched this.
- Fix NPE in CarriageSyncData (Unknown cause)
- Fixed crash when applying text to display boards before they initialise
- Fixed incorrect itemstack remainders on Weighted Ejectors
- Other mods' wrenches now always behave like the Create wrench on IWrenchables
2023-02-02 12:14:25 +01:00
simibubi
1188071b9a
Update bug_report.yml 2023-01-30 21:34:56 +01:00
simibubi
7ed2f71a01 Port new Changes
- AE2 does not have ores on 1.19
- Datagen
2023-01-30 00:24:14 +01:00
simibubi
5223cbe4fc Merge branch 'mc1.18/dev' into mc1.19/dev 2023-01-30 00:03:46 +01:00
simibubi
5836ad4b82 Compatulations
- Fixed AE2 ore crushing compat recipes not using up-to-date modid/blocks
- Added Enchantment Descriptions
2023-01-29 23:42:08 +01:00
PepperCode1
7dc6fc7576 Advanced Tooltip Modification
- Finish refactor of item description tooltips and kinetic stat tooltips
- Change Palette to use Style instead of ChatFormatting
- Remove old code in TooltipHelper
- Add deferred registration capabilities to AttachedRegistry
- Move creative mode tabs to AllCreativeModeTabs
- Delete IItemHandlerModifiableIntermediate
- Delete StorageInterfaceMovement
2023-01-29 11:09:32 -08:00
simibubi
8cf282372c Tangled handlers
- Fixed server-side ticking code called from the render thread with forge 40.2.1 and up
2023-01-29 16:49:01 +01:00
52593a2ae9 fix nullability crash in Carriage.java 2023-01-29 16:07:19 +01:00
simibubi
157077b0ef Payload Overload
- Potential fix for players getting kicked while merging very large track networks
2023-01-28 21:04:25 +01:00
simibubi
582ead2b92 Certified forge user
- Use builtin composite loader to fix blending issues with nixie tube and display link models
2023-01-24 17:26:39 +01:00
simibubi
9ab3b77294 Repeat offender
- Crashes that occur during schematic loading no longer terminate the server
- Fixed crash when creating new belts at existing chutes/funnels
- Fixed ghost items appearing on non-powered belts when extracted from
2023-01-24 15:29:59 +01:00
simibubi
6606a07d44 Remove Localisation templates 2023-01-24 14:12:04 +01:00
Zelophed
94be8b33b0
Merge pull request #4337 from triphora/patch-1
Fix Modrinth README badge
2023-01-20 16:00:31 +01:00
PepperCode1
f2b472f90d Renaming II
- TileEntity -> BlockEntity
2023-01-19 13:35:41 -08:00
triphora
31e2edc9bf
Fix Modrinth README badge
API v1 has been deprecated for over a year now and should no longer be used. There are two options for implementation of this fix:
- Use the dedicated shields.io route
- Update it to still manually construct the request with API v2

Each has advantages and disadvantages. Namely, the former no longer has the precise count, and the latter will need manual reconstruction every time that the API updates. Considering that this is down to the clock with how many deprecation warnings have gone out at this point, I believe the former is the best option, and thus the one I have implemented in this PR. If you believe the latter is better, feel free to request that change.
2023-01-19 14:59:25 -05:00
PepperCode1
624b2d71d1 Renaming I
- Container -> Menu
2023-01-17 13:37:18 -08:00