Renamed some files and cleaned up code

miyucomics · Mar 1, 2024 · 529f5bc · 529f5bc
1 parent 436cde1
commit 529f5bc
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 24 deletions.
diff --git a/...sting/mishaps/NeedActiveArchLampMishap.kt → ...ting/mishaps/NeedsActiveArchLampMishap.kt b/...sting/mishaps/NeedActiveArchLampMishap.kt → ...ting/mishaps/NeedsActiveArchLampMishap.kt
@@ -10,7 +10,7 @@ import net.minecraft.text.Text
 import net.minecraft.util.DyeColor
 import net.minecraft.util.Hand
 
-class NeedActiveArchLampMishap : Mishap() {
+class NeedsActiveArchLampMishap : Mishap() {
 	override fun accentColor(ctx: CastingContext, errorCtx: Context): FrozenColorizer = dyeColor(DyeColor.RED)
 	override fun particleSpray(ctx: CastingContext) = ParticleSpray.burst(ctx.caster.pos, 1.0)
 	override fun errorMessage(ctx: CastingContext, errorCtx: Context): Text = error(Hexical.MOD_ID + ":needs_active_arch_lamp")

diff --git a/...hexical/casting/mishaps/NeedLampMishap.kt → ...exical/casting/mishaps/NeedsLampMishap.kt b/...hexical/casting/mishaps/NeedLampMishap.kt → ...exical/casting/mishaps/NeedsLampMishap.kt
@@ -10,7 +10,7 @@ import net.minecraft.text.Text
 import net.minecraft.util.DyeColor
 import net.minecraft.util.Hand
 
-class NeedLampMishap : Mishap() {
+class NeedsLampMishap : Mishap() {
 	override fun accentColor(ctx: CastingContext, errorCtx: Context): FrozenColorizer = dyeColor(DyeColor.RED)
 	override fun particleSpray(ctx: CastingContext) = ParticleSpray.burst(ctx.caster.pos, 1.0)
 	override fun errorMessage(ctx: CastingContext, errorCtx: Context): Text = error(Hexical.MOD_ID + ":needs_lamp")

diff --git a/common/src/main/java/miyucomics/hexical/casting/patterns/operators/lamp/OpGetArchLampData.kt b/common/src/main/java/miyucomics/hexical/casting/patterns/operators/lamp/OpGetArchLampData.kt
@@ -7,7 +7,7 @@ import at.petrak.hexcasting.api.spell.iota.Iota
 import at.petrak.hexcasting.api.spell.iota.NullIota
 import at.petrak.hexcasting.api.spell.iota.Vec3Iota
 import at.petrak.hexcasting.common.lib.hex.HexIotaTypes
-import miyucomics.hexical.casting.mishaps.NeedActiveArchLampMishap
+import miyucomics.hexical.casting.mishaps.NeedsActiveArchLampMishap
 import miyucomics.hexical.persistent_state.PersistentStateHandler
 import miyucomics.hexical.utils.CastingUtils
 
@@ -16,7 +16,7 @@ class OpGetArchLampData(private val mode: Int) : ConstMediaAction {
 
 	override fun execute(args: List<Iota>, ctx: CastingContext): List<Iota> {
 		if (!CastingUtils.doesPlayerHaveActiveArchLamp(ctx.caster))
-			throw NeedActiveArchLampMishap()
+			throw NeedsActiveArchLampMishap()
 		val state = PersistentStateHandler.getPlayerState(ctx.caster)
 		when (mode) {
 			0 -> return listOf(Vec3Iota(state.position))

diff --git a/common/src/main/java/miyucomics/hexical/casting/patterns/operators/lamp/OpGetLampData.kt b/common/src/main/java/miyucomics/hexical/casting/patterns/operators/lamp/OpGetLampData.kt
@@ -7,15 +7,15 @@ import at.petrak.hexcasting.api.spell.iota.Iota
 import at.petrak.hexcasting.api.spell.iota.NullIota
 import at.petrak.hexcasting.api.spell.iota.Vec3Iota
 import at.petrak.hexcasting.api.utils.vecFromNBT
-import miyucomics.hexical.casting.mishaps.NeedLampMishap
+import miyucomics.hexical.casting.mishaps.NeedsLampMishap
 import miyucomics.hexical.registry.HexicalItems
 
 class OpGetLampData(private val mode: Int) : ConstMediaAction {
 	override val argc = 0
 
 	override fun execute(args: List<Iota>, ctx: CastingContext): List<Iota> {
 		if (!(ctx.caster.activeItem.item == HexicalItems.LAMP_ITEM && ctx.source == CastingContext.CastSource.PACKAGED_HEX))
-			throw NeedLampMishap()
+			throw NeedsLampMishap()
 		val nbt = ctx.caster.activeItem.nbt ?: return listOf(NullIota())
 		when (mode) {
 			0 -> return listOf(Vec3Iota(vecFromNBT(nbt.getLongArray("position"))))

diff --git a/...sting/patterns/spells/OpConfigureBlock.kt → ...tterns/spells/OpConfigureAdvancedBlock.kt b/...sting/patterns/spells/OpConfigureBlock.kt → ...tterns/spells/OpConfigureAdvancedBlock.kt
@@ -8,7 +8,7 @@ import miyucomics.hexical.blocks.AdvancedConjuredBlock
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Vec3d
 
-class OpConfigureBlock(private val property: String, arguments: Int = 0) : SpellAction {
+class OpConfigureAdvancedBlock(private val property: String, arguments: Int = 0) : SpellAction {
 	override val argc = arguments + 1
 
 	override fun execute(args: List<Iota>, ctx: CastingContext): Triple<RenderedSpell, Int, List<ParticleSpray>> {

diff --git a/common/src/main/java/miyucomics/hexical/casting/patterns/spells/OpSetArchLampStorage.kt b/common/src/main/java/miyucomics/hexical/casting/patterns/spells/OpSetArchLampStorage.kt
@@ -7,7 +7,7 @@ import at.petrak.hexcasting.api.spell.casting.CastingContext
 import at.petrak.hexcasting.api.spell.iota.Iota
 import at.petrak.hexcasting.api.spell.mishaps.MishapOthersName
 import at.petrak.hexcasting.common.lib.hex.HexIotaTypes
-import miyucomics.hexical.casting.mishaps.NeedActiveArchLampMishap
+import miyucomics.hexical.casting.mishaps.NeedsActiveArchLampMishap
 import miyucomics.hexical.persistent_state.PersistentStateHandler
 import miyucomics.hexical.utils.CastingUtils
 
@@ -16,7 +16,7 @@ class OpSetArchLampStorage : SpellAction {
 
 	override fun execute(args: List<Iota>, ctx: CastingContext): Triple<RenderedSpell, Int, List<ParticleSpray>>? {
 		if (!CastingUtils.doesPlayerHaveActiveArchLamp(ctx.caster))
-			throw NeedActiveArchLampMishap()
+			throw NeedsActiveArchLampMishap()
 		val iota = args[0]
 		val trueName = MishapOthersName.getTrueNameFromDatum(iota, ctx.caster)
 		if (trueName != null)

diff --git a/...asting/patterns/spells/OpTerminateLamp.kt → ...ng/patterns/spells/OpTerminateArchLamp.kt b/...asting/patterns/spells/OpTerminateLamp.kt → ...ng/patterns/spells/OpTerminateArchLamp.kt
@@ -5,16 +5,16 @@ import at.petrak.hexcasting.api.spell.RenderedSpell
 import at.petrak.hexcasting.api.spell.SpellAction
 import at.petrak.hexcasting.api.spell.casting.CastingContext
 import at.petrak.hexcasting.api.spell.iota.Iota
-import miyucomics.hexical.casting.mishaps.NeedActiveArchLampMishap
+import miyucomics.hexical.casting.mishaps.NeedsActiveArchLampMishap
 import miyucomics.hexical.registry.HexicalItems
 import miyucomics.hexical.utils.CastingUtils
 
-class OpTerminateLamp : SpellAction {
+class OpTerminateArchLamp : SpellAction {
 	override val argc = 0
 
 	override fun execute(args: List<Iota>, ctx: CastingContext): Triple<RenderedSpell, Int, List<ParticleSpray>> {
 		if (!CastingUtils.doesPlayerHaveActiveArchLamp(ctx.caster))
-			throw NeedActiveArchLampMishap()
+			throw NeedsActiveArchLampMishap()
 		return Triple(Spell(), 0, listOf())
 	}
 

diff --git a/common/src/main/java/miyucomics/hexical/interfaces/CastingContextMixinInterface.kt b/common/src/main/java/miyucomics/hexical/interfaces/CastingContextMixinInterface.kt
@@ -3,6 +3,6 @@ package miyucomics.hexical.interfaces
 interface CastingContextMixinInterface {
 	fun getCastByLamp(): Boolean
 	fun setCastByLamp(castByLamp: Boolean)
-	fun getArchlamp(): Boolean
-	fun setArchlamp(castByLamp: Boolean)
+	fun getArchLamp(): Boolean
+	fun setArchLamp(castByLamp: Boolean)
 }
diff --git a/common/src/main/java/miyucomics/hexical/mixin/CastingContextMixin.java b/common/src/main/java/miyucomics/hexical/mixin/CastingContextMixin.java
@@ -11,6 +11,6 @@ public abstract class CastingContextMixin implements CastingContextMixinInterfac
 	@Unique private boolean hexical$archlamp = false;
 	@Override public boolean getCastByLamp() {return hexical$isCastByLamp;}
 	@Override public void setCastByLamp(boolean value) {hexical$isCastByLamp = value;}
-	@Override public boolean getArchlamp() {return hexical$archlamp;}
-	@Override public void setArchlamp(boolean value) {hexical$archlamp = value;}
+	@Override public boolean getArchLamp() {return hexical$archlamp;}
+	@Override public void setArchLamp(boolean value) {hexical$archlamp = value;}
 }
diff --git a/common/src/main/java/miyucomics/hexical/mixin/CastingHarnessMixin.java b/common/src/main/java/miyucomics/hexical/mixin/CastingHarnessMixin.java
@@ -38,7 +38,7 @@ private boolean silenceLamp (ServerWorld world, PlayerEntity player, double x, d
 	@Inject(method = "withdrawMedia", at = @At("HEAD"), cancellable = true, remap = false)
 	private void withdrawMediaWisp(int mediaCost, boolean allowOvercast, CallbackInfoReturnable<Integer> cir) {
 		CastingContext ctx = hexical$harness.getCtx();
-		if (((CastingContextMixinInterface) (Object) ctx).getArchlamp()) {
+		if (((CastingContextMixinInterface) (Object) ctx).getArchLamp()) {
 			if (ctx.getCaster().isCreative()) {
 				cir.setReturnValue(0);
 				return;

diff --git a/common/src/main/java/miyucomics/hexical/registry/HexicalPatterns.kt b/common/src/main/java/miyucomics/hexical/registry/HexicalPatterns.kt
@@ -19,11 +19,11 @@ object HexicalPatterns {
 	var NEPHTHYS_GAMBIT = register(HexPattern.fromAngles("deaqqdq", HexDir.SOUTH_EAST), "nephthys", OpNephthys);
 
 	var CONJURE_ADVANCED_BLOCK: HexPattern = register(HexPattern.fromAngles("dee", HexDir.NORTH_WEST), "conjure_advanced_block", OpConjureAdvancedBlock())
-	var CONFIGURE_BLOCK_BOUNCY: HexPattern = register(HexPattern.fromAngles("deeqa", HexDir.NORTH_WEST), "modify_block_bouncy", OpConfigureBlock("bouncy"))
-	var CONFIGURE_BLOCK_EPHEMERAL: HexPattern = register(HexPattern.fromAngles("deewwaawd", HexDir.NORTH_WEST), "modify_block_ephemeral", OpConfigureBlock("ephemeral", 1))
-	var CONFIGURE_BLOCK_INVISIBLE: HexPattern = register(HexPattern.fromAngles("deeqedeaqqqwqqq", HexDir.NORTH_WEST), "modify_block_invisible", OpConfigureBlock("invisible"))
-	var CONFIGURE_BLOCK_REPLACEABLE: HexPattern = register(HexPattern.fromAngles("deewqaqqqqq", HexDir.NORTH_WEST), "modify_block_replaceable", OpConfigureBlock("replaceable"))
-	var CONFIGURE_BLOCK_VOLATILE: HexPattern = register(HexPattern.fromAngles("deewedeeeee", HexDir.NORTH_WEST), "modify_block_volatile", OpConfigureBlock("volatile"))
+	var CONFIGURE_BLOCK_BOUNCY: HexPattern = register(HexPattern.fromAngles("deeqa", HexDir.NORTH_WEST), "modify_block_bouncy", OpConfigureAdvancedBlock("bouncy"))
+	var CONFIGURE_BLOCK_EPHEMERAL: HexPattern = register(HexPattern.fromAngles("deewwaawd", HexDir.NORTH_WEST), "modify_block_ephemeral", OpConfigureAdvancedBlock("ephemeral", 1))
+	var CONFIGURE_BLOCK_INVISIBLE: HexPattern = register(HexPattern.fromAngles("deeqedeaqqqwqqq", HexDir.NORTH_WEST), "modify_block_invisible", OpConfigureAdvancedBlock("invisible"))
+	var CONFIGURE_BLOCK_REPLACEABLE: HexPattern = register(HexPattern.fromAngles("deewqaqqqqq", HexDir.NORTH_WEST), "modify_block_replaceable", OpConfigureAdvancedBlock("replaceable"))
+	var CONFIGURE_BLOCK_VOLATILE: HexPattern = register(HexPattern.fromAngles("deewedeeeee", HexDir.NORTH_WEST), "modify_block_volatile", OpConfigureAdvancedBlock("volatile"))
 
 	var CHORUS_BLINK: HexPattern = register(HexPattern.fromAngles("aawqqqq", HexDir.SOUTH_EAST), "chorus_blink", OpChorusBlink())
 	var PROGRAM_LAMP: HexPattern = register(HexPattern.fromAngles("wwqqqqq", HexDir.EAST), "program_lamp", OpProgramLamp())
@@ -40,7 +40,7 @@ object HexicalPatterns {
 	var ARCH_LAMP_USE_TIME: HexPattern = register(HexPattern.fromAngles("qaqwddedqwddwa", HexDir.NORTH_EAST), "get_arch_lamp_use_time", OpGetArchLampData(3))
 	var ARCH_LAMP_STORAGE: HexPattern = register(HexPattern.fromAngles("qaqwddedqwaqqqqq", HexDir.NORTH_EAST), "get_arch_lamp_storage", OpGetArchLampData(4))
 	var IS_USING_LAMP: HexPattern = register(HexPattern.fromAngles("qaqwddedqeed", HexDir.NORTH_EAST), "is_using_lamp", OpIsUsingArchLamp())
-	var TERMINATE_LAMP: HexPattern = register(HexPattern.fromAngles("qaqwddedwaqdee", HexDir.NORTH_EAST), "terminate_arch_lamp", OpTerminateLamp())
+	var TERMINATE_LAMP: HexPattern = register(HexPattern.fromAngles("qaqwddedwaqdee", HexDir.NORTH_EAST), "terminate_arch_lamp", OpTerminateArchLamp())
 	var SET_LAMP_STORAGE: HexPattern = register(HexPattern.fromAngles("qaqwddedqedeeeee", HexDir.NORTH_EAST), "set_arch_lamp_storage", OpSetArchLampStorage())
 
 	@JvmStatic

diff --git a/common/src/main/java/miyucomics/hexical/utils/CastingUtils.kt b/common/src/main/java/miyucomics/hexical/utils/CastingUtils.kt
@@ -15,7 +15,7 @@ class CastingUtils {
 			val context = CastingContext(user, user.activeHand, CastingContext.CastSource.PACKAGED_HEX)
 			(context as CastingContextMixinInterface).setCastByLamp(true)
 			if (archlamp)
-				(context as CastingContextMixinInterface).setArchlamp(true)
+				(context as CastingContextMixinInterface).setArchLamp(true)
 			CastingHarness(context).executeIotas(hex, world)
 		}