Altarik/ReFramed
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix: injection remapping issues fixed + additional check' (#19) from dev into master
All checks were successful
deploy / deploy (push) Successful in 5m11s
Details

Browse Source 
Reviewed-on: #19
This commit is contained in:
Adrien1106 2024-06-14 00:37:13 +02:00
commit 4eddb32190
5 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -122,7 +122,7 @@ dependencies {
modRuntimeOnly "earth.terrarium.chipped:Chipped-fabric-${project.minecraft_version}:3.1.2" modRuntimeOnly "earth.terrarium.chipped:Chipped-fabric-${project.minecraft_version}:3.1.2"
// Axiom for blueprint support // Axiom for blueprint support
modCompileOnly "maven.modrinth:N6n5dqoA:nvx3oDkz" modCompileOnly "maven.modrinth:N6n5dqoA:YxeYxQyz"
modCompileOnly "com.github.moulberry:AxiomClientAPI:1.0.5.3" modCompileOnly "com.github.moulberry:AxiomClientAPI:1.0.5.3"
// Fabric API. // Fabric API.

2
gradle.properties
View File

@ -9,7 +9,7 @@ loader_version=0.15.11
# Mod Properties # Mod Properties
modrinth_id = jCpoCBpn modrinth_id = jCpoCBpn
mod_version = 1.6 mod_version = 1.6.1
maven_group = fr.adrien1106 maven_group = fr.adrien1106
archives_base_name = ReFramed archives_base_name = ReFramed
mod_id = reframed mod_id = reframed

3
src/main/java/fr/adrien1106/reframed/mixin/compat/AxiomChunkedBlockRegionMixin.java
View File

@ -98,11 +98,10 @@ public abstract class AxiomChunkedBlockRegionMixin implements IAxiomChunkedBlock
@Inject( @Inject(
method = "getBlockEntity", method = "getBlockEntity",
at = @At("HEAD"), at = @At("HEAD"),
remap = false,
cancellable = true cancellable = true
) )
private void onGetBlockEntity(BlockPos pos, CallbackInfoReturnable<BlockEntity> cir) { private void onGetBlockEntity(BlockPos pos, CallbackInfoReturnable<BlockEntity> cir) {
if (inverse_transform == null) return; if (inverse_transform == null || block_entities == null) return;
long key = BlockPos.asLong( long key = BlockPos.asLong(
inverse_transform.transformX(pos.getX(), pos.getY(), pos.getZ()), inverse_transform.transformX(pos.getX(), pos.getY(), pos.getZ()),
inverse_transform.transformY(pos.getX(), pos.getY(), pos.getZ()), inverse_transform.transformY(pos.getX(), pos.getY(), pos.getZ()),

1
src/main/java/fr/adrien1106/reframed/mixin/compat/AxiomMappedBlockAndTintGetterMixin.java
View File

@ -21,7 +21,6 @@ public class AxiomMappedBlockAndTintGetterMixin {
at = @At( at = @At(
value = "RETURN" value = "RETURN"
), ),
remap = false,
cancellable = true cancellable = true
) )
private void onGetBlockEntity(BlockPos pos, CallbackInfoReturnable<BlockEntity> cir) { private void onGetBlockEntity(BlockPos pos, CallbackInfoReturnable<BlockEntity> cir) {

3
src/main/java/fr/adrien1106/reframed/mixin/compat/AxiomPlacementMixin.java
View File

@ -30,8 +30,7 @@ public class AxiomPlacementMixin {
@Inject( @Inject(
method = "startPlacement(Lnet/minecraft/util/math/BlockPos;Lcom/moulberry/axiom/render/regions/ChunkedBlockRegion;Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;Ljava/lang/String;)I", method = "startPlacement(Lnet/minecraft/util/math/BlockPos;Lcom/moulberry/axiom/render/regions/ChunkedBlockRegion;Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;Ljava/lang/String;)I",
at = @At("HEAD"), at = @At("HEAD")
remap = false
) )
private void onStartPlacement(BlockPos target, ChunkedBlockRegion region, Long2ObjectMap<CompressedBlockEntity> entities, String description, CallbackInfoReturnable<Integer> cir) { private void onStartPlacement(BlockPos target, ChunkedBlockRegion region, Long2ObjectMap<CompressedBlockEntity> entities, String description, CallbackInfoReturnable<Integer> cir) {
((IAxiomChunkedBlockRegionMixin) region).setTransform(new IntMatrix(), entities); ((IAxiomChunkedBlockRegionMixin) region).setTransform(new IntMatrix(), entities);