-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update dasm version, move all redirect sets to java.
Much of ASMConfigPlugin also moved to dasm!
- Loading branch information
1 parent
196a5b9
commit 68ccdb1
Showing
18 changed files
with
239 additions
and
502 deletions.
There are no files selected for viewing
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
271 changes: 23 additions & 248 deletions
271
src/main/java/io/github/opencubicchunks/cubicchunks/mixin/ASMConfigPlugin.java
Large diffs are not rendered by default.
Oops, something went wrong.
7 changes: 0 additions & 7 deletions
7
src/main/java/io/github/opencubicchunks/cubicchunks/mixin/CopyFrom.java
This file was deleted.
Oops, something went wrong.
53 changes: 53 additions & 0 deletions
53
src/main/java/io/github/opencubicchunks/cubicchunks/mixin/CubeAccessAndDescendantsSet.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
package io.github.opencubicchunks.cubicchunks.mixin; | ||
|
||
import io.github.opencubicchunks.cubicchunks.world.level.cube.CubeAccess; | ||
import io.github.opencubicchunks.cubicchunks.world.level.cube.ImposterProtoCube; | ||
import io.github.opencubicchunks.cubicchunks.world.level.cube.LevelCube; | ||
import io.github.opencubicchunks.cubicchunks.world.level.cube.ProtoCube; | ||
import io.github.opencubicchunks.dasm.api.Ref; | ||
import io.github.opencubicchunks.dasm.api.redirect.DasmRedirectSet; | ||
import io.github.opencubicchunks.dasm.api.redirect.FieldRedirect; | ||
import io.github.opencubicchunks.dasm.api.redirect.MethodRedirect; | ||
import io.github.opencubicchunks.dasm.api.redirect.TypeRedirect; | ||
import net.minecraft.world.level.ChunkPos; | ||
import net.minecraft.world.level.chunk.ChunkAccess; | ||
import net.minecraft.world.level.chunk.ImposterProtoChunk; | ||
import net.minecraft.world.level.chunk.LevelChunk; | ||
import net.minecraft.world.level.chunk.ProtoChunk; | ||
|
||
@DasmRedirectSet | ||
public interface CubeAccessAndDescendantsSet extends GeneralSet { | ||
@TypeRedirect(from = @Ref(ChunkAccess.class), to = @Ref(CubeAccess.class)) | ||
abstract class ChunkAccessToCubeAccessRedirects { | ||
@FieldRedirect("cloPos") protected ChunkPos chunkPos; | ||
|
||
@MethodRedirect("cc_getCloPos") public native ChunkPos getPos(); | ||
} | ||
|
||
@TypeRedirect(from = @Ref(LevelChunk.class), to = @Ref(LevelCube.class)) | ||
abstract class LevelChunkToLevelCubeRedirects { } | ||
|
||
@TypeRedirect( | ||
from = @Ref(string = "net.minecraft.world.level.chunk.LevelChunk$BoundTickingBlockEntity"), | ||
to = @Ref(string = "io.github.opencubicchunks.cubicchunks.world.level.cube.LevelCube$BoundTickingBlockEntity") | ||
) | ||
abstract class LevelChunk$BoundTickingBlockEntityToLevelCube$BoundTickingBlockEntityRedirects { } | ||
|
||
@TypeRedirect( | ||
from = @Ref(string = "net.minecraft.world.level.chunk.LevelChunk$PostLoadProcessor"), | ||
to = @Ref(string = "io.github.opencubicchunks.cubicchunks.world.level.cube.LevelCube$PostLoadProcessor") | ||
) | ||
abstract class LevelChunk$PostLoadProcessorToLevelCube$PostLoadProcessorRedirects { } | ||
|
||
@TypeRedirect( | ||
from = @Ref(string = "net.minecraft.world.level.chunk.LevelChunk$RebindableTickingBlockEntityWrapper"), | ||
to = @Ref(string = "io.github.opencubicchunks.cubicchunks.world.level.cube.LevelCube$RebindableTickingBlockEntityWrapper") | ||
) | ||
abstract class LevelChunk$RebindableTickingBlockEntityWrapperToLevelCube$RebindableTickingBlockEntityWrapperRedirects { } | ||
|
||
@TypeRedirect(from = @Ref(ProtoChunk.class), to = @Ref(ProtoCube.class)) | ||
abstract class ProtoChunkToProtoCubeRedirects { } | ||
|
||
@TypeRedirect(from = @Ref(ImposterProtoChunk.class), to = @Ref(ImposterProtoCube.class)) | ||
abstract class ImposterProtoChunkToImposterProtoCubeRedirects { } | ||
} |
12 changes: 0 additions & 12 deletions
12
src/main/java/io/github/opencubicchunks/cubicchunks/mixin/DasmRedirect.java
This file was deleted.
Oops, something went wrong.
27 changes: 27 additions & 0 deletions
27
src/main/java/io/github/opencubicchunks/cubicchunks/mixin/GeneralSet.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
package io.github.opencubicchunks.cubicchunks.mixin; | ||
|
||
import io.github.opencubicchunks.cubicchunks.world.level.chunklike.CloAccess; | ||
import io.github.opencubicchunks.cubicchunks.world.level.chunklike.CloPos; | ||
import io.github.opencubicchunks.cubicchunks.world.level.chunklike.LevelClo; | ||
import io.github.opencubicchunks.dasm.api.Ref; | ||
import io.github.opencubicchunks.dasm.api.redirect.DasmRedirectSet; | ||
import io.github.opencubicchunks.dasm.api.redirect.MethodRedirect; | ||
import io.github.opencubicchunks.dasm.api.redirect.TypeRedirect; | ||
import net.minecraft.world.level.ChunkPos; | ||
import net.minecraft.world.level.chunk.ChunkAccess; | ||
import net.minecraft.world.level.chunk.LevelChunk; | ||
|
||
@DasmRedirectSet | ||
public interface GeneralSet { | ||
@TypeRedirect(from = @Ref(ChunkPos.class), to = @Ref(CloPos.class)) | ||
abstract class ChunkPosToCloPosRedirects { } | ||
|
||
@TypeRedirect(from = @Ref(ChunkAccess.class), to = @Ref(CloAccess.class)) | ||
abstract class ChunkAccessToCloAccessRedirects { | ||
@MethodRedirect("cc_getCloPos") | ||
public native ChunkPos getPos(); | ||
} | ||
|
||
@TypeRedirect(from = @Ref(LevelChunk.class), to = @Ref(LevelClo.class)) | ||
abstract class LevelChunkToLevelCloRedirects { } | ||
} |
32 changes: 0 additions & 32 deletions
32
src/main/java/io/github/opencubicchunks/cubicchunks/mixin/TransformFrom.java
This file was deleted.
Oops, something went wrong.
7 changes: 0 additions & 7 deletions
7
src/main/java/io/github/opencubicchunks/cubicchunks/mixin/TransformFromClass.java
This file was deleted.
Oops, something went wrong.
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
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
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
8 changes: 0 additions & 8 deletions
8
...o/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerLevel.java
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
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
Oops, something went wrong.