WIP 1.19.2 Port #300
Merged
WIP 1.19.2 Port #300
Conversation
This file contains 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
# Conflicts: # common/src/main/java/org/valkyrienskies/mod/mixin/client/world/MixinClientLevel.java # common/src/main/java/org/valkyrienskies/mod/mixin/entity/MixinEntity.java # common/src/main/java/org/valkyrienskies/mod/mixin/server/command/MixinCommands.java # common/src/main/java/org/valkyrienskies/mod/mixin/server/network/MixinServerGamePacketListenerImpl.java # common/src/main/java/org/valkyrienskies/mod/mixin/server/world/MixinChunkMap.java # common/src/main/kotlin/org/valkyrienskies/mod/common/item/ShipAssemblerItem.kt # common/src/main/kotlin/org/valkyrienskies/mod/common/item/ShipCreatorItem.kt # fabric/src/main/java/org/valkyrienskies/mod/fabric/mixin/world/level/block/FireMixin.java # gradle.properties # quilt/build.gradle # quilt/src/main/java/org/valkyrienskies/mod/quilt/mixin/world/level/block/FireMixin.java # quilt/src/main/resources/quilt.mod.json
* Initial Commit Added Config Option for Turtles leaving Scaled Ships Added CCT and CCR to their respective build.gradle files Added README.MD to both Forge and Fabric * Initial Commit CC:R Fabric Added MixinSpeakerPosition - Fix Speakers playing sounds in Shipyard instead of Worldspace Added MixinTurtleBrain - If Turtle is on a ship, target position is outside of ship's VoxelAABB, and ship is not scaled, Turtle leaves ship Added MixinTurtleMoveCommand - Turtles can not enter a position where a ship is located - Turtles can not leave a ship's ActiveChunkSet Added MixinWirelessNetwork - FIx Modems not being able to communicate to/from ships * Added ComputerCraft mass file * Forge Added MixinSpeakerPosition Added MixinTurtleMoveCommand Added MixinTurtleBrain Added MixinWirelessNetwork Updated CCT * Final Commit Edited both README.MD files to reflect the Mixins in place * Both ------------------------- Edited MixinTurtleMoveCommand to use ChunkClaim instead of IActiveChunkSet * Both ---------------------- Edited MixinTurtleBrain to replace deprecated method getShipVoxelAABB() with getShipAABB() * Both ---------------------- Edited MixinTurtleBrain to replace deprecated method getShipTransform() with getTransform() Edited MixinTurtleMoveCommand to remove unused method isShipScaled()
* Added MixinClaimedChunkManager to pass Shipyard positions to worldspace to be tested against Edited build.gradle:common to add FTB Chunks, Utilities, and Teams, as well as the CurseMaven repository Edited valkyrienskies-common.mixins.json to add MixinClaimedChunkManager * Edited MixinClaimedChunkManager to add a check for build height to allow ships to fly over claimed chunks * Edited MixinClaimedChunkManager to use the actual position * Fixed Crash Edited MixinClaimedChunkManager to change the position passed to the newly created ChunkDimPos instance for getChunk * Re-added build height check to allow ships to fly over claims without falling under claim's protection * Added a new Config Segment for FTB Chunks with 2 Config Options to disable ships being protected and to disable ships being protected above/below build height * remove maven repo Co-authored-by: Rubydesic <[email protected]>
# Conflicts: # common/src/main/java/org/valkyrienskies/mod/mixin/client/MixinMinecraft.java # common/src/main/java/org/valkyrienskies/mod/mixin/client/multiplayer/MixinClientPacketListener.java # common/src/main/java/org/valkyrienskies/mod/mixin/feature/entity_collision/MixinEntity.java # common/src/main/java/org/valkyrienskies/mod/mixin/mod_compat/vanilla_renderer/MixinLevelRendererVanilla.java # common/src/main/java/org/valkyrienskies/mod/mixin/server/MixinPlayerList.java # common/src/main/java/org/valkyrienskies/mod/mixin/server/network/MixinServerGamePacketListenerImpl.java # common/src/main/java/org/valkyrienskies/mod/mixin/server/world/MixinChunkMap$TrackedEntity.java # common/src/main/kotlin/org/valkyrienskies/mod/compat/clothconfig/VSClothConfig.kt # fabric/build.gradle # fabric/src/main/resources/fabric.mod.json # forge/src/main/java/org/valkyrienskies/mod/forge/mixin/world/level/block/FireMixin.java # gradle.properties
…orld, not whenever setPosRaw is called
|
|
* Wingmogus :amogus: * feature/wings-pt2 * Fixed PhysShipImpl.transform computed incorrectly * Inject wings from BlockStateInfoProvider * Made WingManager an attachment * Partial work towards contraption wings * Updated vs-core
* - relocateBlock uses vanilla blockstate rotate for compatibility - relocateBlock has option to update blocks around it or not - updateBlock method to thoroughly update moved blocks - Assembly updates blocks separately after moving all of them (cherry picked from commit 9c6279b) * - Fixes occasional NPE when using chunk.getBlockEntity after blockstate is set (cherry picked from commit 68e04d6) * - Document numbers, clean up unnecessary flags (cherry picked from commit d23e987) * - More adjustment to updateBlock - Flag 64 and neighbor updates were causing blocks to break that shouldn't break. (cherry picked from commit 49f473a)
… doing hashmap lookups
…ick time doing hashmap lookups" This reverts commit 8bf4a62.
# Conflicts: # common/src/main/kotlin/org/valkyrienskies/mod/common/item/ShipCreatorItem.kt # fabric/build.gradle # forge/src/main/kotlin/org/valkyrienskies/mod/forge/common/ValkyrienSkiesModForge.kt
Fixed a typo, feel free to ignore the pull and change yourself if u don't want me in contributors
This fixes rendering issues on TIS-3D meaning that TIS-3D can actually be used on ValkrienSkies ships now
# Conflicts: # common/src/main/java/org/valkyrienskies/mod/mixin/server/world/MixinChunkMap.java # common/src/main/kotlin/org/valkyrienskies/mod/common/item/ShipCreatorItem.kt
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.