Skip to content

Commit 05ae2a6

Browse files
committed
Move debug environment classes into their own package
1 parent f726a6f commit 05ae2a6

File tree

12 files changed

+15
-256
lines changed

12 files changed

+15
-256
lines changed

Common/src/main/java/gay/object/hexdebug/mixin/MixinBlockSlate.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package gay.object.hexdebug.mixin;
22

33
import at.petrak.hexcasting.api.block.circle.BlockCircleComponent;
4-
import at.petrak.hexcasting.api.casting.circles.ICircleComponent;
54
import at.petrak.hexcasting.api.casting.eval.ExecutionClientView;
65
import at.petrak.hexcasting.api.casting.eval.env.CircleCastEnv;
76
import at.petrak.hexcasting.api.casting.eval.vm.CastingImage;
@@ -13,7 +12,7 @@
1312
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
1413
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
1514
import gay.object.hexdebug.core.api.HexDebugCoreAPI;
16-
import gay.object.hexdebug.core.api.debugging.BaseCircleDebugEnv;
15+
import gay.object.hexdebug.core.api.debugging.env.BaseCircleDebugEnv;
1716
import gay.object.hexdebug.core.api.debugging.DebuggableCircleComponent;
1817
import gay.object.hexdebug.core.api.exceptions.IllegalDebugSessionException;
1918
import net.minecraft.core.BlockPos;

Common/src/main/java/gay/object/hexdebug/mixin/MixinCastingEnvironment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package gay.object.hexdebug.mixin;
22

33
import at.petrak.hexcasting.api.casting.eval.CastingEnvironment;
4-
import gay.object.hexdebug.core.api.debugging.DebugEnvironment;
4+
import gay.object.hexdebug.core.api.debugging.env.DebugEnvironment;
55
import gay.object.hexdebug.impl.IDebugEnvAccessor;
66
import org.jetbrains.annotations.Nullable;
77
import org.spongepowered.asm.mixin.Mixin;

Common/src/main/kotlin/gay/object/hexdebug/adapter/DebugAdapter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import at.petrak.hexcasting.api.casting.math.HexPattern
1111
import gay.`object`.hexdebug.HexDebug
1212
import gay.`object`.hexdebug.adapter.proxy.DebugProxyServerLauncher
1313
import gay.`object`.hexdebug.config.HexDebugServerConfig
14-
import gay.`object`.hexdebug.core.api.debugging.DebugEnvironment
14+
import gay.`object`.hexdebug.core.api.debugging.env.DebugEnvironment
1515
import gay.`object`.hexdebug.core.api.exceptions.IllegalDebugSessionException
1616
import gay.`object`.hexdebug.core.api.exceptions.IllegalDebugThreadException
1717
import gay.`object`.hexdebug.debugger.*

Common/src/main/kotlin/gay/object/hexdebug/debugger/HexDebugger.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import at.petrak.hexcasting.common.casting.actions.eval.OpEval
1515
import at.petrak.hexcasting.common.lib.hex.HexEvalSounds
1616
import gay.`object`.hexdebug.casting.eval.FrameBreakpoint
1717
import gay.`object`.hexdebug.casting.iotas.CognitohazardIota
18-
import gay.`object`.hexdebug.core.api.debugging.DebugEnvironment
18+
import gay.`object`.hexdebug.core.api.debugging.env.DebugEnvironment
1919
import gay.`object`.hexdebug.core.api.debugging.DebugStepType
2020
import gay.`object`.hexdebug.debugger.allocators.VariablesAllocator
2121
import gay.`object`.hexdebug.impl.IDebugEnvAccessor

Common/src/main/kotlin/gay/object/hexdebug/debugger/circles/CircleDebugEnv.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import at.petrak.hexcasting.api.casting.eval.CastingEnvironment
66
import at.petrak.hexcasting.api.casting.eval.ResolvedPatternType
77
import at.petrak.hexcasting.api.casting.eval.env.PlayerBasedCastEnv.AMBIT_RADIUS
88
import at.petrak.hexcasting.api.casting.eval.vm.CastingImage
9-
import gay.`object`.hexdebug.core.api.debugging.BaseCircleDebugEnv
9+
import gay.`object`.hexdebug.core.api.debugging.env.BaseCircleDebugEnv
1010
import net.minecraft.core.BlockPos
1111
import net.minecraft.network.chat.Component
1212
import net.minecraft.server.level.ServerPlayer

Common/src/main/kotlin/gay/object/hexdebug/impl/HexDebugCoreAPIImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import at.petrak.hexcasting.api.casting.iota.Iota
66
import gay.`object`.hexdebug.adapter.DebugAdapter
77
import gay.`object`.hexdebug.adapter.DebugAdapterManager
88
import gay.`object`.hexdebug.core.api.HexDebugCoreAPI
9-
import gay.`object`.hexdebug.core.api.debugging.DebugEnvironment
9+
import gay.`object`.hexdebug.core.api.debugging.env.DebugEnvironment
1010
import gay.`object`.hexdebug.core.api.debugging.DebugOutputCategory
1111
import gay.`object`.hexdebug.core.api.exceptions.IllegalDebugSessionException
1212
import net.minecraft.network.chat.Component

Common/src/main/kotlin/gay/object/hexdebug/items/DebuggerItem.kt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import gay.`object`.hexdebug.HexDebug
99
import gay.`object`.hexdebug.adapter.DebugAdapterManager
1010
import gay.`object`.hexdebug.casting.eval.DebuggerCastEnv
1111
import gay.`object`.hexdebug.core.api.debugging.DebuggableBlock
12-
import gay.`object`.hexdebug.core.api.debugging.SimplePlayerBasedDebugEnv
12+
import gay.`object`.hexdebug.core.api.debugging.env.SimplePlayerBasedDebugEnv
1313
import gay.`object`.hexdebug.core.api.exceptions.DebugException
1414
import gay.`object`.hexdebug.items.base.*
1515
import gay.`object`.hexdebug.utils.asItemPredicate
@@ -160,7 +160,12 @@ class DebuggerItem(
160160
} ?: return InteractionResultHolder.fail(stack)
161161

162162
val env = DebuggerCastEnv(serverPlayer, usedHand)
163-
val debugEnv = SimplePlayerBasedDebugEnv(serverPlayer, env, instrs, stack.styledHoverName)
163+
val debugEnv = SimplePlayerBasedDebugEnv(
164+
serverPlayer,
165+
env,
166+
instrs,
167+
stack.styledHoverName
168+
)
164169

165170
try {
166171
debugEnv.start(threadId)

Core/src/main/java/gay/object/hexdebug/core/api/HexDebugCoreAPI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import at.petrak.hexcasting.api.casting.eval.CastingEnvironment;
44
import at.petrak.hexcasting.api.casting.eval.vm.CastingImage;
55
import at.petrak.hexcasting.api.casting.iota.Iota;
6-
import gay.object.hexdebug.core.api.debugging.DebugEnvironment;
6+
import gay.object.hexdebug.core.api.debugging.env.DebugEnvironment;
77
import gay.object.hexdebug.core.api.debugging.DebugOutputCategory;
88
import gay.object.hexdebug.core.api.exceptions.IllegalDebugSessionException;
99
import gay.object.hexdebug.core.api.exceptions.IllegalDebugThreadException;

Core/src/main/java/gay/object/hexdebug/core/api/debugging/BaseCircleDebugEnv.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

Core/src/main/java/gay/object/hexdebug/core/api/debugging/DebugEnvironment.java

Lines changed: 0 additions & 146 deletions
This file was deleted.

0 commit comments

Comments
 (0)