Skip to content

chore: rename fromAngles and fromAnglesUnchecked #1276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Olfi01 wants to merge 1 commit into
base: 1.21
Choose a base branch
from
Open

chore: rename fromAngles and fromAnglesUnchecked #1276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 38 additions & 38 deletions Common/src/main/java/at/petrak/hexcasting/api/casting/arithmetic/Arithmetic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,49 +24,49 @@ public interface Arithmetic {

// Below are some common Operator patterns that you can make use of in your Arithmetic:

HexPattern ADD = HexPattern.fromAngles("waaw", HexDir.NORTH_EAST);
HexPattern SUB = HexPattern.fromAngles("wddw", HexDir.NORTH_WEST);
HexPattern MUL = HexPattern.fromAngles("waqaw", HexDir.SOUTH_EAST);
HexPattern DIV = HexPattern.fromAngles("wdedw", HexDir.NORTH_EAST);
HexPattern ABS = HexPattern.fromAngles("wqaqw", HexDir.NORTH_EAST);
HexPattern POW = HexPattern.fromAngles("wedew", HexDir.NORTH_WEST);
HexPattern FLOOR = HexPattern.fromAngles("ewq", HexDir.EAST);
HexPattern CEIL = HexPattern.fromAngles("qwe", HexDir.EAST);
HexPattern SIN = HexPattern.fromAngles("qqqqqaa", HexDir.SOUTH_EAST);
HexPattern COS = HexPattern.fromAngles("qqqqqad", HexDir.SOUTH_EAST);
HexPattern TAN = HexPattern.fromAngles("wqqqqqadq", HexDir.SOUTH_WEST);
HexPattern ARCSIN = HexPattern.fromAngles("ddeeeee", HexDir.SOUTH_EAST);
HexPattern ARCCOS = HexPattern.fromAngles("adeeeee", HexDir.NORTH_EAST);
HexPattern ARCTAN = HexPattern.fromAngles("eadeeeeew", HexDir.NORTH_EAST);
HexPattern ARCTAN2 = HexPattern.fromAngles("deadeeeeewd", HexDir.WEST);
HexPattern LOG = HexPattern.fromAngles("eqaqe", HexDir.NORTH_WEST);
HexPattern MOD = HexPattern.fromAngles("addwaad", HexDir.NORTH_EAST);
HexPattern ADD = HexPattern.fromDrawableAngles("waaw", HexDir.NORTH_EAST);
HexPattern SUB = HexPattern.fromDrawableAngles("wddw", HexDir.NORTH_WEST);
HexPattern MUL = HexPattern.fromDrawableAngles("waqaw", HexDir.SOUTH_EAST);
HexPattern DIV = HexPattern.fromDrawableAngles("wdedw", HexDir.NORTH_EAST);
HexPattern ABS = HexPattern.fromDrawableAngles("wqaqw", HexDir.NORTH_EAST);
HexPattern POW = HexPattern.fromDrawableAngles("wedew", HexDir.NORTH_WEST);
HexPattern FLOOR = HexPattern.fromDrawableAngles("ewq", HexDir.EAST);
HexPattern CEIL = HexPattern.fromDrawableAngles("qwe", HexDir.EAST);
HexPattern SIN = HexPattern.fromDrawableAngles("qqqqqaa", HexDir.SOUTH_EAST);
HexPattern COS = HexPattern.fromDrawableAngles("qqqqqad", HexDir.SOUTH_EAST);
HexPattern TAN = HexPattern.fromDrawableAngles("wqqqqqadq", HexDir.SOUTH_WEST);
HexPattern ARCSIN = HexPattern.fromDrawableAngles("ddeeeee", HexDir.SOUTH_EAST);
HexPattern ARCCOS = HexPattern.fromDrawableAngles("adeeeee", HexDir.NORTH_EAST);
HexPattern ARCTAN = HexPattern.fromDrawableAngles("eadeeeeew", HexDir.NORTH_EAST);
HexPattern ARCTAN2 = HexPattern.fromDrawableAngles("deadeeeeewd", HexDir.WEST);
HexPattern LOG = HexPattern.fromDrawableAngles("eqaqe", HexDir.NORTH_WEST);
HexPattern MOD = HexPattern.fromDrawableAngles("addwaad", HexDir.NORTH_EAST);


// Vecs
HexPattern PACK = HexPattern.fromAngles("eqqqqq", HexDir.EAST);
HexPattern UNPACK = HexPattern.fromAngles("qeeeee", HexDir.EAST);
HexPattern PACK = HexPattern.fromDrawableAngles("eqqqqq", HexDir.EAST);
HexPattern UNPACK = HexPattern.fromDrawableAngles("qeeeee", HexDir.EAST);

// Lists
HexPattern INDEX = HexPattern.fromAngles("deeed", HexDir.NORTH_WEST);
HexPattern SLICE = HexPattern.fromAngles("qaeaqwded", HexDir.NORTH_WEST);
HexPattern APPEND = HexPattern.fromAngles("edqde", HexDir.SOUTH_WEST);
HexPattern UNAPPEND = HexPattern.fromAngles("qaeaq", HexDir.NORTH_WEST);
HexPattern REV = HexPattern.fromAngles("qqqaede", HexDir.EAST);
HexPattern INDEX_OF = HexPattern.fromAngles("dedqde", HexDir.EAST);
HexPattern REMOVE = HexPattern.fromAngles("edqdewaqa", HexDir.SOUTH_WEST);
HexPattern REPLACE = HexPattern.fromAngles("wqaeaqw", HexDir.NORTH_WEST);
HexPattern CONS = HexPattern.fromAngles("ddewedd", HexDir.SOUTH_EAST);
HexPattern UNCONS = HexPattern.fromAngles("aaqwqaa", HexDir.SOUTH_WEST);
HexPattern INDEX = HexPattern.fromDrawableAngles("deeed", HexDir.NORTH_WEST);
HexPattern SLICE = HexPattern.fromDrawableAngles("qaeaqwded", HexDir.NORTH_WEST);
HexPattern APPEND = HexPattern.fromDrawableAngles("edqde", HexDir.SOUTH_WEST);
HexPattern UNAPPEND = HexPattern.fromDrawableAngles("qaeaq", HexDir.NORTH_WEST);
HexPattern REV = HexPattern.fromDrawableAngles("qqqaede", HexDir.EAST);
HexPattern INDEX_OF = HexPattern.fromDrawableAngles("dedqde", HexDir.EAST);
HexPattern REMOVE = HexPattern.fromDrawableAngles("edqdewaqa", HexDir.SOUTH_WEST);
HexPattern REPLACE = HexPattern.fromDrawableAngles("wqaeaqw", HexDir.NORTH_WEST);
HexPattern CONS = HexPattern.fromDrawableAngles("ddewedd", HexDir.SOUTH_EAST);
HexPattern UNCONS = HexPattern.fromDrawableAngles("aaqwqaa", HexDir.SOUTH_WEST);

// Boolean Logic, Comparisons, & Sets
HexPattern AND = HexPattern.fromAngles("wdw", HexDir.NORTH_EAST);
HexPattern OR = HexPattern.fromAngles("waw", HexDir.SOUTH_EAST);
HexPattern XOR = HexPattern.fromAngles("dwa", HexDir.NORTH_WEST);
HexPattern GREATER = HexPattern.fromAngles("e", HexDir.SOUTH_EAST);
HexPattern LESS = HexPattern.fromAngles("q", HexDir.SOUTH_WEST);
HexPattern GREATER_EQ = HexPattern.fromAngles("ee", HexDir.SOUTH_EAST);
HexPattern LESS_EQ = HexPattern.fromAngles("qq", HexDir.SOUTH_WEST);
HexPattern NOT = HexPattern.fromAngles("dw", HexDir.NORTH_WEST);
HexPattern UNIQUE = HexPattern.fromAngles("aweaqa", HexDir.NORTH_EAST);
HexPattern AND = HexPattern.fromDrawableAngles("wdw", HexDir.NORTH_EAST);
HexPattern OR = HexPattern.fromDrawableAngles("waw", HexDir.SOUTH_EAST);
HexPattern XOR = HexPattern.fromDrawableAngles("dwa", HexDir.NORTH_WEST);
HexPattern GREATER = HexPattern.fromDrawableAngles("e", HexDir.SOUTH_EAST);
HexPattern LESS = HexPattern.fromDrawableAngles("q", HexDir.SOUTH_WEST);
HexPattern GREATER_EQ = HexPattern.fromDrawableAngles("ee", HexDir.SOUTH_EAST);
HexPattern LESS_EQ = HexPattern.fromDrawableAngles("qq", HexDir.SOUTH_WEST);
HexPattern NOT = HexPattern.fromDrawableAngles("dw", HexDir.NORTH_WEST);
HexPattern UNIQUE = HexPattern.fromDrawableAngles("aweaqa", HexDir.NORTH_EAST);
}
8 changes: 4 additions & 4 deletions Common/src/main/java/at/petrak/hexcasting/api/casting/math/HexPattern.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ data class HexPattern(val startDir: HexDir, val angles: MutableList<HexAngle> =
}.flatXmap({
val dir = HexDir.fromString(it.startDir)
try {
return@flatXmap DataResult.success(fromAnglesUnchecked(it.anglesSignature, dir))
return@flatXmap DataResult.success(fromAnyAngles(it.anglesSignature, dir))
} catch (exception: IllegalArgumentException) {
return@flatXmap DataResult.error { exception.message }
}
Expand All @@ -144,7 +144,7 @@ data class HexPattern(val startDir: HexDir, val angles: MutableList<HexAngle> =
val STREAM_CODEC: StreamCodec<RegistryFriendlyByteBuf, HexPattern> = StreamCodec.composite(
ByteBufCodecs.STRING_UTF8, HexPattern::anglesSignature,
HexDir.STREAM_CODEC, HexPattern::startDir,
HexPattern::fromAnglesUnchecked
HexPattern::fromAnyAngles
)

/**
Expand All @@ -154,7 +154,7 @@ data class HexPattern(val startDir: HexDir, val angles: MutableList<HexAngle> =
*/
@JvmStatic
@Throws(IllegalArgumentException::class, IllegalStateException::class)
fun fromAngles(signature: String, startDir: HexDir): HexPattern {
fun fromDrawableAngles(signature: String, startDir: HexDir): HexPattern {
val out = HexPattern(startDir)

var cursor = HexCoord.Origin
Expand Down Expand Up @@ -192,7 +192,7 @@ data class HexPattern(val startDir: HexDir, val angles: MutableList<HexAngle> =
*/
@JvmStatic
@Throws(IllegalArgumentException::class)
fun fromAnglesUnchecked(signature: String, startDir: HexDir): HexPattern {
fun fromAnyAngles(signature: String, startDir: HexDir): HexPattern {
val out = HexPattern(startDir)

for ((idx, c) in signature.withIndex()) {
Expand Down
3 changes: 1 addition & 2 deletions Common/src/main/java/at/petrak/hexcasting/common/casting/PatternRegistryManifest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import com.mojang.datafixers.util.Pair;
import net.minecraft.resources.ResourceKey;
import net.minecraft.server.level.ServerLevel;
import org.apache.commons.lang3.NotImplementedException;
import org.jetbrains.annotations.Nullable;

import java.util.List;
Expand Down Expand Up @@ -119,6 +118,6 @@ public static HexPattern getCanonicalStrokesPerWorld(ResourceKey<ActionRegistryE

var sig = pair.getFirst();
var entry = pair.getSecond();
return HexPattern.fromAnglesUnchecked(sig, entry.canonicalStartDir());
return HexPattern.fromAnyAngles(sig, entry.canonicalStartDir());
}
}
2 changes: 1 addition & 1 deletion Common/src/main/java/at/petrak/hexcasting/common/command/ListPerWorldPatternsCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ private static int giveAll(CommandSourceStack source, Collection<ServerPlayer> t
var found = save.lookupReverse(key);
var signature = found.getFirst();
var startDir = found.getSecond().canonicalStartDir();
var pat = HexPattern.fromAnglesUnchecked(signature, startDir);
var pat = HexPattern.fromAnyAngles(signature, startDir);

var stack = new ItemStack(HexItems.SCROLL_LARGE.get());
stack.set(HexDataComponents.ACTION.get(), key);
Expand Down
Loading
Loading