-
Notifications
You must be signed in to change notification settings - Fork 6
feature: Sable compatability with Dynamic Dimensions. When Sable is i… #11
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
dbe32f3
feature: Sable compatability with Dynamic Dimensions. When Sable is i…
maxryan008 52090c9
Fixed all review issues and ran spotless apply
maxryan008 17c4d90
Merge branch 'minecraft/1.21' into feature/sable-compat
maxryan008 107884e
Small fixes
maxryan008 543e7ae
Add back dependencies for common
maxryan008 233dc00
Removed api dependency into normal compile only
maxryan008 abbfc6c
Fixed issues with compatability.
maxryan008 f6f15d9
Run spotless apply for licence headers
maxryan008 6a0405d
Update sable version
maxryan008 7125d5d
Fix small nitpicks and run spotless
maxryan008 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
common/src/main/java/dev/galacticraft/dynamicdimensions/api/DynamicDimensionProperties.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| /* | ||
| * Copyright (c) 2021-2025 Team Galacticraft | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
|
|
||
| package dev.galacticraft.dynamicdimensions.api; | ||
|
|
||
| import org.joml.Vector3f; | ||
|
|
||
| /** | ||
| * Generic physics/environment properties for a dynamic dimension. | ||
| * | ||
| * DynamicDimensions does not decide what these values mean. | ||
| * Optional compat layers, such as Sable compat, may consume them. | ||
| */ | ||
| public abstract class DynamicDimensionProperties { | ||
| public abstract int priority(); | ||
|
|
||
| public abstract Vector3f baseGravity(); | ||
|
|
||
| public abstract double basePressure(); | ||
|
|
||
| public abstract float universalDrag(); | ||
|
|
||
| public abstract Vector3f magneticNorth(); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
...in/java/dev/galacticraft/dynamicdimensions/impl/compat/DynamicDimensionPhysicsCompat.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * Copyright (c) 2021-2025 Team Galacticraft | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
|
|
||
| package dev.galacticraft.dynamicdimensions.impl.compat; | ||
|
|
||
| import dev.galacticraft.dynamicdimensions.api.DynamicDimensionProperties; | ||
| import dev.galacticraft.dynamicdimensions.impl.platform.Services; | ||
| import net.minecraft.resources.ResourceKey; | ||
| import net.minecraft.world.level.Level; | ||
|
|
||
| import static dev.galacticraft.dynamicdimensions.impl.compat.SableDimensionPhysicsCompat.SABLE_MOD_ID; | ||
|
|
||
| public final class DynamicDimensionPhysicsCompat { | ||
| private DynamicDimensionPhysicsCompat() { | ||
| } | ||
|
|
||
| public static void apply(ResourceKey<Level> key, DynamicDimensionProperties properties) { | ||
| if (Services.PLATFORM.isModLoaded(SABLE_MOD_ID)) { | ||
| SableDimensionPhysicsCompat.apply(key, properties); | ||
| } | ||
| } | ||
|
|
||
| public static void remove(ResourceKey<Level> key) { | ||
| if (Services.PLATFORM.isModLoaded(SABLE_MOD_ID)) { | ||
| SableDimensionPhysicsCompat.remove(key); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.