Anvilcraft/Create
1
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-17 21:23:41 +01:00
Code Issues Projects Releases Packages Wiki Activity
1721 commits 31 branches 14 tags 108 MiB
Commit graph

1390 commits

Author SHA1 Message Date
simibubi
c82896998c
Merge pull request #1216 from mrh0/mc1.15/dev 
Improved modding support
 2021-04-02 18:56:20 +02:00
simibubi
6cfbf26f49 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-04-01 17:46:07 +02:00
simibubi
6c942be7f5 Too slippery 
- Sliding on contraptions now takes its slope into account
- Gantry Carriages are now less prone to break when moved near other blocks
 2021-04-01 17:43:39 +02:00
JozsefA
4b00562daf Port to 1.16 2021-03-31 21:44:16 -07:00
JozsefA
4908fc1b96 Change some obfuscated variable names 2021-03-31 21:29:17 -07:00
JozsefA
78fbb52ddc Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.16/dev 
# Conflicts:
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java
#	src/main/java/com/simibubi/create/content/curiosities/TreeFertilizerItem.java
 2021-03-31 21:17:01 -07:00
JozsefA
c21a8bcbde Fix startup crash on some AMD drivers. 
- The fix comes from Grondag's work on canvas.
 - Original commit: 820bf75409
 2021-03-31 20:53:02 -07:00
JozsefA
6ef88c3bd8 Fix some issues with instance rate limiting 2021-03-31 16:25:59 -07:00
JozsefA
b9f6a3b94e Instanced bearings 2021-03-31 16:19:58 -07:00
JozsefA
b743e00978 Better lazy arm instances 2021-03-31 16:18:53 -07:00
grimmauld
240510e3ee Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-03-31 21:18:43 +02:00
grimmauld
3cc8291b72 Simpler bouncing? Thanks @K1521 2021-03-31 21:18:33 +02:00
Snownee
c02193233b Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev 2021-04-01 01:46:52 +08:00
Snownee
ba63cc3e7f Fix tree fertilizer spreading podzol. Backport a440ab6 2021-04-01 01:43:06 +08:00
simibubi
b6857c2a20 Danger Polish 
- Fixed Crash when Deployer attempts to use Sand Paper
 2021-03-31 15:27:57 +02:00
simibubi
e82f9221b7 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-03-31 15:23:18 +02:00
simibubi
5b63f30df3 Abort Mission 
- Drills and other block breakers on contraptions now give up trying to destroy a block when their movement direction is reversed
 2021-03-31 15:22:41 +02:00
simibubi
2b4ef88fc1 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-03-31 14:50:16 +02:00
simibubi
d61e387916 The least performant option 
- Fixed slow merging of collision shapes
- Improved async handling of the collision shape merger
- BBs far away from an entity now get skipped in the collision cycle
 2021-03-31 14:27:27 +02:00
JozsefA
65d21c374b Fix crash making step sounds on servers. 2021-03-30 18:50:07 -07:00
simibubi
0bb18db4b6 Oriented bouncing and sliding 
- Slime blocks on a moving Contraption are now bouncy
- Ice blocks on moving Contraptions are now very slippery
 2021-03-31 03:16:29 +02:00
JozsefA
376c4e1cb0 Fix crash rendering mechanical crafters on contraptions. 2021-03-30 15:08:42 -07:00
JozsefA
c905aa5e2e Merge branch 'mc1.15/dev' into mc1.16/dev 
# Conflicts:
#	src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlyWheelInstance.java
#	src/main/java/com/simibubi/create/content/contraptions/components/mixer/MixerInstance.java
#	src/main/java/com/simibubi/create/content/contraptions/components/press/PressInstance.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerInstance.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionKineticRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeInstance.java
#	src/main/java/com/simibubi/create/content/logistics/block/FlapData.java
#	src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInstance.java
 2021-03-30 14:58:08 -07:00
JozsefA
4ec25798a5 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-03-30 14:17:16 -07:00
JozsefA
a2b9dfc28a Change the locks 
- InstanceKey is no more.
 - InstanceData and co. keep track of removals and updates.
 - InstancedModel's buffer management is much more sane now.
 - Re-add mixin to #tickBlockEntities and ensure compat with Performant.
 - Move ...backend.instancing.impl to backend.core
 2021-03-30 14:14:58 -07:00
simibubi
8a4eaef015 Fix tooltip whitespace 2021-03-30 18:56:22 +02:00
simibubi
9fa63743b6 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-03-30 18:49:13 +02:00
simibubi
ae340ccac0 Spooky ghost honey 
- Fixed pipes drawing non-source honey from beehives
- Fixed deployers duplicating glass bottles
 2021-03-30 18:48:57 +02:00
simibubi
dba1ff9c34 Port new Changes 2021-03-30 18:34:55 +02:00
simibubi
37c3625d4a Merge branch 'mc1.15/dev' into mc1.16/dev 2021-03-30 18:34:40 +02:00
simibubi
3a6714fb08 Handy Tweaks 
- Deployers now place block drops into their internal inventory
- Deployers can now harvest honey or honeycombs from beehives
- Pipes can now connect to and drain liquid honey from beehives
 2021-03-30 18:10:24 +02:00
simibubi
389b2e0e90 Ponder fix-ups 
- Input window elements no longer use integer coordinates
- Comfy reading is now a config option and persists across ponder UIs
- Disabled editor mode
 2021-03-30 16:57:21 +02:00
simibubi
c2f3ebbf72 Fix Tooltips on 1.16 2021-03-30 16:32:19 +02:00
JozsefA
ff4a9e5c78 Fix arms glitching out on contraptions. 
- Also provide a hook for subclasses of InstancedTileRenderer to control when specific instances tick.
 2021-03-29 15:06:09 -07:00
grimmauld
358ff25031 Fix 1.16 too, i guess 2021-03-29 23:25:28 +02:00
zelophed
0b6098817e fix some wrench rotation issues 2021-03-29 20:31:08 +02:00
grimmauld
dadde271e4 Fix even more critical crashes, now on schematics 2021-03-29 18:19:17 +02:00
grimmauld
69f4c9f8ad Fix WrappedWorld.getLightingProvider being null and crashing 2021-03-29 17:19:18 +02:00
grimmauld
90b9a3aff9 Merge & Port 2021-03-29 10:57:50 +02:00
simibubi
5299204fb5 Better Tooltip Integration 
- Removed overlapping tooltips
- Adjusted tooltip presentation for more visual consistency
 2021-03-28 20:56:55 +02:00
simibubi
bf2a506bb8 A final thought 
- Fixed non-splitting modes on brass tunnels
- Ponder scenes for ejectors and tunnels
 2021-03-28 18:57:50 +02:00
grimmauld
caa3c57b71 Merge & Port 2021-03-28 10:58:25 +02:00
zelophed
683d18b994 tick off some todos 2021-03-28 04:19:58 +02:00
simibubi
76bd3b3f50 Pondering too fast 
- Added a button to slow down ponder scenes while any text is shown on screen
 2021-03-28 01:52:04 +01:00
simibubi
fcae7e5c9a Motion commotion 
- Update recipe for redstone contact
- Counteracted ejector inaccuracies caused by deferred activation
- Rewired ponder vertex sorting to evade Optifine incompatibilities
 2021-03-28 00:45:14 +01:00
JozsefA
d28e60a059 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-03-27 16:38:36 -07:00
JozsefA
4e7777a130 Fix more instancing nonsense. 
OrientedData was still applying the origin position shift, so some
things (mechanical presses) wouldn't appear in the right spot.
 2021-03-27 16:35:47 -07:00
grimmauld
1739e72af0 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-03-28 00:21:13 +01:00
grimmauld
1bffb82ae4 Cogwheel refactor Part III 
- Removed the calls to the AllBlocks entries where necessary
- Made placement helpers call the same code as CogWheelBlock.isValidPosition
 2021-03-28 00:19:27 +01:00
JozsefA
5f49698a94 Fix mixer weirdness. 
- Mixer and Press instances now use the quaternion shader.
 2021-03-27 15:06:56 -07:00
grimmauld
7b022cd302 Cogwheel refactor Part II 
- Refactored getStateForPlacement to reduce doubled code
 2021-03-27 23:05:59 +01:00
grimmauld
4ff20b4217 Cogwheel refactor Part I 
- Moved hasIntegratedCogWheel and isSmallCog to ICogWheel
 2021-03-27 22:42:27 +01:00
simibubi
497ea4bb66 Foolish not to avoid the lack of counteracting no-clip 
- Ejectors now occasionally track launched items, scanning for any obstacles in their trajectory
- Fixed rendered items passing an Ejectors' target on clients ticking faster than their server
- Removed outdated warnings for 'transposer funnels'
 2021-03-27 20:14:55 +01:00
grimmauld
6e0e3d28fd Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-03-27 19:15:57 +01:00
grimmauld
bec6b1d414 Try to make terraforged less angry against Create world gen 2021-03-27 19:15:52 +01:00
zelophed
a5a9ea1b7f ponder particles, pog 2021-03-27 16:33:23 +01:00
zelophed
c9ba76a2d1 Assisted Placement, Part IV-c 
- indicator renders again
- changed the config to allow the indicator to be disabled altogether
 2021-03-27 16:01:05 +01:00
JozsefA
fd98bd4976 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-03-27 01:10:42 -07:00
JozsefA
a7d714f8ba Fix for ponder particles yeeting Flywheel rendering. 
I need to isolate the world load/unload stuff for
Flywheel anyway, a more robust solution is needed.
 2021-03-27 01:10:01 -07:00
grimmauld
5dad567766 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-03-27 08:32:32 +01:00
grimmauld
9bc25db615 Keep everything up to date 2021-03-27 08:32:23 +01:00
JozsefA
4675e0ad15 Stop relying on IDynamicInstance#beginFrame to setup instance state. 
- Gantry carriages no longer update when not necessary.
 2021-03-26 22:59:47 -07:00
JozsefA
d3d338e64b STE tick optimization. 
- SmartTileEntity#tick down to 3.32% from 11.64% cpu time.
 - Measured by JFR over 2 sessions each >8min.
 - Test world was the deployer fields.
 - Iterating over HashMap values is slow.
 - Collect TileEntityBehaviours into a list when the contents of SmartTileEntity#behaviours changes.
 2021-03-26 22:02:19 -07:00
JozsefA
cf5eea5a10 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-03-26 17:31:41 -07:00
JozsefA
0b25f662dc Frame rate and tick rate limiting with distance. 
- Significant performance improvement when dealing with massive amounts of dynamic instances, otherwise marginal.
 2021-03-26 16:47:37 -07:00
zelophed
7230489b19 placement helper oversight 
- shout-out to d'arcy :P
 2021-03-27 00:41:09 +01:00
zelophed
56b1170224 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 
# Conflicts:
#	src/main/java/com/simibubi/create/foundation/ponder/content/PonderTagScreen.java
 2021-03-26 23:59:19 +01:00
zelophed
687743d18f ponder polish 
- some more changes to z-levels in ponder screens
- should be equal to 1.15 ponder now, except for the particles
 2021-03-26 23:57:53 +01:00
grimmauld
24c306df90 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-03-26 23:26:22 +01:00
JozsefA
e91a15cf5f Ejectors wind up again. 2021-03-26 15:25:42 -07:00
grimmauld
60bc6102e2 Add Create stone to base_stone_overworld block tag (terraforged was complaining) 2021-03-26 23:21:44 +01:00
grimmauld
fe10c258c4 Merge & Port 2021-03-26 23:13:49 +01:00
grimmauld
5a176204a5 Merge & Port 2021-03-26 22:17:23 +01:00
simibubi
cb759e793e 3D Printing is cool again 
- Fixed Schematicannon clearing blocks outside of a Schematics' bounding box
- Safety check for onBlockPlacedBy with null player
- Deployers with a positioned Schematic as their filter will place blocks accordingly, taking items from the contraption inventory
 2021-03-26 22:05:16 +01:00
simibubi
0afb29f9a6 Simulate and Translocate 
- Adjusted Brass Tunnels once again to better deal with non-complete item transferrals
- Brass tunnels now always output to their sides first
- Thrown chromatic products are now gravity-less
- Sneaking on Ejectors bypasses them triggering
- Fixed ponder tag item listing
- Ejectors now trigger observers
- Fixed negative bottom pull distance in chutes
- Fixed smart chutes deleting non-stackable items
- Fixed chutes not able to output partial stacks
- Ejectors can now be paused with redstone
- Deferred ejector launches by one tick to 'unground' entities more consistently
 2021-03-26 18:41:03 +01:00
grimmauld
f28a3e87f3 No longer keep making new wrappers (but particles still don't work) 2021-03-26 16:50:06 +01:00
grimmauld
1675ee25b4 Fix ponder text being shy and hiding behind other things 2021-03-26 16:27:57 +01:00
grimmauld
35c62360be Merge & Port 2021-03-26 16:03:09 +01:00
grimmauld
9c8d035694 Dya see the dye? 2021-03-26 13:35:45 +01:00
grimmauld
b582b39ae4 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-03-26 09:11:48 +01:00
grimmauld
5fa8a0b808 Revert "Fix leave finding in saws so compatibility with other mods works" 
This is necessary to make the distance gathering work. Sorry me dumb dumb
 2021-03-26 09:11:25 +01:00
JozsefA
1d2b51250c Instanced Ejectors and better hashing for BehaviourTypes. 2021-03-25 21:27:08 -07:00
simibubi
718142e26f Faith in your Depot 
- Added Weighted Ejectors
- Fixed? some tunnel distribution inconsistencies
 2021-03-26 00:15:38 +01:00
JozsefA
2e5d7a734f Fix ConcurrentModificationException preparing frame for rendering. 2021-03-25 15:10:40 -07:00
JozsefA
affb8abfbd Potentially fix weird crash. 2021-03-25 14:48:42 -07:00
JozsefA
a56514c308 Some housekeeping and documentation. 2021-03-25 14:29:52 -07:00
zelophed
8c79174904 fix pressing recipe inconsistency (closes #1296) 2021-03-25 03:58:24 +01:00
zelophed
e26191aaf7 GuiGameReposition 
- adjust the position of the item renderer for gui elements
- include a warning when joining a world while fabulous graphics are enabled
 2021-03-25 02:27:10 +01:00
JozsefA
b18993ed26 Little things. 
- Quark magnets don't crash (already fixed).
 - Fix quark magnet leaving behind ghost instances.
 - Fix crash with belt lighting after being placed by contraptions.
 - Simplify tile add/remove mixins and avoid conflict with Performant.
 - Avoid FloatBuffer detour when uploading matrix uniforms.
 - InstancedTileRenderer no longer has to clean up.
 - Properly let go of tickable instances.
 2021-03-24 15:48:15 -07:00
grimmauld
73f87ab44e Exotic smoking 
- all blocks tagged as campfires that have the lit blockstate property set to true are now valid smoke sources
 2021-03-24 23:42:42 +01:00
grimmauld
4d22b5e9b4 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-03-24 15:07:51 +01:00
grimmauld
7eafbe5757 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-03-24 15:07:04 +01:00
grimmauld
16586747a6 Increase priority, less crashing with performant 2021-03-24 15:06:54 +01:00
grimmauld
cbbf502003 port recent changes 2021-03-24 14:54:24 +01:00
JozsefA
1233ecfe80 Fix belt lighting issues, again. 2021-03-23 14:13:32 -07:00
JozsefA
5eae3a53fc Keeps getting hotter. 
- Belts now use the new system.
 - Remove ILightListener.java.
 - Listeners can choose to remove themselves.
 - Rename some static GridAlignedBB methods.
 2021-03-23 02:12:09 -07:00
JozsefA
20189a86fc Spicy light update listening api. 
- Round 1, no profiling done yet, not everything uses it.
 - WeakHashSet could be useful elsewhere, too.
 2021-03-23 00:08:31 -07:00
JozsefA
1310b88828 Lieutenant Scatterbrain II. 
- Swich to tabs. (not everything is tabs yet)
 - Refactor light and color attributes to their own Enum.
 - Quaternion/pivot/position attribute shader.
 - Always update an instance when the WorldRenderer checks if it should rerender a block.
 - Simplify some names.
 - Remove generics in InstanceData classes.
 - Deployer Tiles now use the oriented material.
 - Press heads now correctly orient themselves.
 - ModelData buffers things faster and is simpler.
 2021-03-22 20:20:52 -07:00
simibubi
f7f7b67a7d Thinking Arms 
- Ponder Scenes for the Mechanical Arm
- Fixed empty basins showing a fluid container tooltip
 2021-03-22 02:05:47 +01:00
simibubi
140cd9a85a Sailing craft 
- Front face of crafters now supports hoppers and co
- Scenes for Sails and Mechanical Crafters
- Fixed a couple strange quirks of Ponder text windows
 2021-03-21 17:38:33 +01:00