get that working
This commit is contained in:
gamma-delta
parent
d2ddf6861d
commit
717516776e
4 changed files with 134 additions and 145 deletions
|
|
@ -1,11 +1,21 @@
|
|||
package at.petrak.hex;
|
||||
|
||||
import at.petrak.hex.client.RegisterClientStuff;
|
||||
import at.petrak.hex.api.PatternRegistry;
|
||||
import at.petrak.hex.api.SpellOperator;
|
||||
import at.petrak.hex.common.casting.SpellDatum;
|
||||
import at.petrak.hex.common.casting.SpellWidget;
|
||||
import at.petrak.hex.common.casting.operators.*;
|
||||
import at.petrak.hex.common.casting.operators.math.*;
|
||||
import at.petrak.hex.common.casting.operators.spells.OpAddMotion;
|
||||
import at.petrak.hex.common.casting.operators.spells.OpExplode;
|
||||
import at.petrak.hex.common.casting.operators.spells.OpPrint;
|
||||
import at.petrak.hex.common.items.HexItems;
|
||||
import at.petrak.hex.common.network.HexMessages;
|
||||
import at.petrak.hex.server.RegisterServerStuff;
|
||||
import com.mojang.datafixers.util.Pair;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
|
||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
|
@ -21,11 +31,109 @@ public class HexMod {
|
|||
// Register ourselves for server and other game events we are interested in
|
||||
var evbus = FMLJavaModLoadingContext.get().getModEventBus();
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
evbus.register(HexMod.class);
|
||||
HexItems.ITEMS.register(evbus);
|
||||
HexMessages.register();
|
||||
}
|
||||
|
||||
// Init the client and server to make the subscribe events work
|
||||
new RegisterServerStuff();
|
||||
new RegisterClientStuff();
|
||||
// I guess this means the client will have a big empty map for patterns
|
||||
@SubscribeEvent
|
||||
public static void registerSpellPatterns(FMLCommonSetupEvent evt) {
|
||||
int count = 0;
|
||||
try {
|
||||
for (Pair<String, SpellOperator> p : new Pair[]{
|
||||
// == Getters ==
|
||||
|
||||
// diamond shape to get the caster
|
||||
new Pair<>("qaq", OpGetCaster.INSTANCE),
|
||||
new Pair<>("ede", OpGetCaster.INSTANCE),
|
||||
// small triangle to get the entity pos
|
||||
new Pair<>("aa", OpEntityPos.INSTANCE),
|
||||
new Pair<>("dd", OpEntityPos.INSTANCE),
|
||||
// Arrow to get the look vector
|
||||
new Pair<>("wa", OpEntityLook.INSTANCE),
|
||||
new Pair<>("wd", OpEntityLook.INSTANCE),
|
||||
|
||||
// CCW battleaxe for block raycast
|
||||
new Pair<>("wqaawdd", OpBlockRaycast.INSTANCE),
|
||||
// and CW for axis raycast
|
||||
new Pair<>("weddwaa", OpBlockAxisRaycast.INSTANCE),
|
||||
// CCW diamond mace thing for entity raycast
|
||||
new Pair<>("weaqa", OpEntityRaycast.INSTANCE),
|
||||
|
||||
// == Modify Stack ==
|
||||
|
||||
// CCW hook for undo
|
||||
new Pair<>("a", OpUndo.INSTANCE),
|
||||
// and CW for null
|
||||
new Pair<>("d", SpellWidget.NULL),
|
||||
// Two triangles holding hands to duplicate
|
||||
new Pair<>("aadaa", OpDuplicate.INSTANCE),
|
||||
// Two opposing triangles to swap
|
||||
new Pair<>("aawdd", OpSwap.INSTANCE),
|
||||
|
||||
// == Math ==
|
||||
new Pair<>("waaw", OpAdd.INSTANCE),
|
||||
new Pair<>("wddw", OpSub.INSTANCE),
|
||||
new Pair<>("waqaw", OpMulDot.INSTANCE),
|
||||
new Pair<>("wdedw", OpDivCross.INSTANCE),
|
||||
new Pair<>("wqaqw", OpAbsLen.INSTANCE),
|
||||
new Pair<>("wedew", OpPowProj.INSTANCE),
|
||||
|
||||
// == Spells ==
|
||||
|
||||
// hook for debug
|
||||
new Pair<>("de", OpPrint.INSTANCE),
|
||||
new Pair<>("aq", OpPrint.INSTANCE),
|
||||
// nuclear sign for explosion
|
||||
new Pair<>("aawaawaa", OpExplode.INSTANCE),
|
||||
new Pair<>("weeewdq", OpAddMotion.INSTANCE),
|
||||
|
||||
// == Meta stuff ==
|
||||
new Pair<>("qqq", SpellWidget.OPEN_PAREN),
|
||||
new Pair<>("eee", SpellWidget.CLOSE_PAREN),
|
||||
new Pair<>("qqqaw", SpellWidget.ESCAPE),
|
||||
// http://www.toroidalsnark.net/mkss3-pix/CalderheadJMM2014.pdf
|
||||
// eval being a space filling curve feels apt doesn't it
|
||||
new Pair<>("deaqq", OpEval.INSTANCE),
|
||||
new Pair<>("aqqqqq", OpReadFromSpellbook.INSTANCE),
|
||||
new Pair<>("deeeee", OpWriteToSpellbook.INSTANCE),
|
||||
}) {
|
||||
PatternRegistry.addRegularPattern(p.getFirst(), p.getSecond());
|
||||
count++;
|
||||
}
|
||||
} catch (PatternRegistry.RegisterPatternException exn) {
|
||||
exn.printStackTrace();
|
||||
}
|
||||
|
||||
// Add zilde->number
|
||||
PatternRegistry.addSpecialHandler(pat -> {
|
||||
var sig = pat.anglesSignature();
|
||||
if (sig.startsWith("aqaa") || sig.startsWith("dedd")) {
|
||||
var negate = sig.startsWith("dedd");
|
||||
var accumulator = 0.0;
|
||||
for (char ch : sig.substring(4).toCharArray()) {
|
||||
if (ch == 'w') {
|
||||
accumulator += 1;
|
||||
} else if (ch == 'q') {
|
||||
accumulator += 5;
|
||||
} else if (ch == 'e') {
|
||||
accumulator += 10;
|
||||
} else if (ch == 'a') {
|
||||
accumulator *= 2;
|
||||
} else if (ch == 'd') {
|
||||
accumulator /= 2;
|
||||
}
|
||||
}
|
||||
if (negate) {
|
||||
accumulator = -accumulator;
|
||||
}
|
||||
return SpellOperator.makeConstantOp(SpellDatum.make(accumulator));
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
});
|
||||
|
||||
HexMod.LOGGER.info("Registered {} patterns", count);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -65,8 +65,7 @@ interface SpellOperator {
|
|||
override val argc: Int
|
||||
get() = 0
|
||||
|
||||
override fun execute(args: List<SpellDatum<*>>, ctx: CastingContext): List<SpellDatum<*>> =
|
||||
spellListOf(x)
|
||||
override fun execute(args: List<SpellDatum<*>>, ctx: CastingContext): List<SpellDatum<*>> = listOf(x)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -274,24 +274,26 @@ class GuiSpellcasting(private val handOpenedWith: InteractionHand) : Screen(Text
|
|||
val mouseCoord = this.pxToCoord(mousePos)
|
||||
val radius = 3
|
||||
for (dotCoord in mouseCoord.rangeAround(radius)) {
|
||||
val dotPx = this.coordToPx(dotCoord)
|
||||
val delta = dotPx.add(mousePos.negated()).length()
|
||||
// when right on top of the cursor, 1.0
|
||||
// when at the full radius, 0! this is so we don't have dots suddenly appear/disappear.
|
||||
// we subtract size from delta so there's a little "island" of 100% bright points by the mouse
|
||||
val scaledDist = Mth.clamp(
|
||||
1.0f - ((delta - this.hexSize()) / (radius.toFloat() * this.hexSize())),
|
||||
0f,
|
||||
1f
|
||||
)
|
||||
drawSpot(
|
||||
mat,
|
||||
dotPx,
|
||||
Mth.lerp(scaledDist, 0.4f, 0.5f),
|
||||
Mth.lerp(scaledDist, 0.8f, 1.0f),
|
||||
Mth.lerp(scaledDist, 0.7f, 0.9f),
|
||||
scaledDist
|
||||
)
|
||||
if (!this.usedSpots.contains(dotCoord)) {
|
||||
val dotPx = this.coordToPx(dotCoord)
|
||||
val delta = dotPx.add(mousePos.negated()).length()
|
||||
// when right on top of the cursor, 1.0
|
||||
// when at the full radius, 0! this is so we don't have dots suddenly appear/disappear.
|
||||
// we subtract size from delta so there's a little "island" of 100% bright points by the mouse
|
||||
val scaledDist = Mth.clamp(
|
||||
1.0f - ((delta - this.hexSize()) / (radius.toFloat() * this.hexSize())),
|
||||
0f,
|
||||
1f
|
||||
)
|
||||
drawSpot(
|
||||
mat,
|
||||
dotPx,
|
||||
Mth.lerp(scaledDist, 0.4f, 0.5f),
|
||||
Mth.lerp(scaledDist, 0.8f, 1.0f),
|
||||
Mth.lerp(scaledDist, 0.7f, 0.9f),
|
||||
scaledDist
|
||||
)
|
||||
}
|
||||
}
|
||||
RenderSystem.defaultBlendFunc()
|
||||
|
||||
|
|
|
|||
|
|
@ -1,120 +0,0 @@
|
|||
package at.petrak.hex.server;
|
||||
|
||||
import at.petrak.hex.HexMod;
|
||||
import at.petrak.hex.api.PatternRegistry;
|
||||
import at.petrak.hex.api.SpellOperator;
|
||||
import at.petrak.hex.common.casting.SpellDatum;
|
||||
import at.petrak.hex.common.casting.SpellWidget;
|
||||
import at.petrak.hex.common.casting.operators.*;
|
||||
import at.petrak.hex.common.casting.operators.math.*;
|
||||
import at.petrak.hex.common.casting.operators.spells.OpAddMotion;
|
||||
import at.petrak.hex.common.casting.operators.spells.OpExplode;
|
||||
import at.petrak.hex.common.casting.operators.spells.OpPrint;
|
||||
import com.mojang.datafixers.util.Pair;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.event.lifecycle.FMLDedicatedServerSetupEvent;
|
||||
|
||||
@Mod.EventBusSubscriber(modid = HexMod.MOD_ID, value = Dist.DEDICATED_SERVER, bus = Mod.EventBusSubscriber.Bus.MOD)
|
||||
public class RegisterServerStuff {
|
||||
@SubscribeEvent
|
||||
public static void registerSpellPatterns(FMLDedicatedServerSetupEvent evt) {
|
||||
int count = 0;
|
||||
try {
|
||||
for (Pair<String, SpellOperator> p : new Pair[]{
|
||||
// == Getters ==
|
||||
|
||||
// diamond shape to get the caster
|
||||
new Pair<>("qaq", OpGetCaster.INSTANCE),
|
||||
new Pair<>("ede", OpGetCaster.INSTANCE),
|
||||
// small triangle to get the entity pos
|
||||
new Pair<>("aa", OpEntityPos.INSTANCE),
|
||||
new Pair<>("dd", OpEntityPos.INSTANCE),
|
||||
// Arrow to get the look vector
|
||||
new Pair<>("wa", OpEntityLook.INSTANCE),
|
||||
new Pair<>("wd", OpEntityLook.INSTANCE),
|
||||
|
||||
// CCW battleaxe for block raycast
|
||||
new Pair<>("wqaawdd", OpBlockRaycast.INSTANCE),
|
||||
// and CW for axis raycast
|
||||
new Pair<>("weddwaa", OpBlockAxisRaycast.INSTANCE),
|
||||
// CCW diamond mace thing for entity raycast
|
||||
new Pair<>("weaqa", OpEntityRaycast.INSTANCE),
|
||||
|
||||
// == Modify Stack ==
|
||||
|
||||
// CCW hook for undo
|
||||
new Pair<>("a", OpUndo.INSTANCE),
|
||||
// and CW for null
|
||||
new Pair<>("d", SpellWidget.NULL),
|
||||
// Two triangles holding hands to duplicate
|
||||
new Pair<>("aadaa", OpDuplicate.INSTANCE),
|
||||
// Two opposing triangles to swap
|
||||
new Pair<>("aawdd", OpSwap.INSTANCE),
|
||||
|
||||
// == Math ==
|
||||
new Pair<>("waaw", OpAdd.INSTANCE),
|
||||
new Pair<>("wddw", OpSub.INSTANCE),
|
||||
new Pair<>("waqaw", OpMulDot.INSTANCE),
|
||||
new Pair<>("wdedw", OpDivCross.INSTANCE),
|
||||
new Pair<>("wqaqw", OpAbsLen.INSTANCE),
|
||||
new Pair<>("wedew", OpPowProj.INSTANCE),
|
||||
|
||||
// == Spells ==
|
||||
|
||||
// hook for debug
|
||||
new Pair<>("de", OpPrint.INSTANCE),
|
||||
new Pair<>("aq", OpPrint.INSTANCE),
|
||||
// nuclear sign for explosion
|
||||
new Pair<>("aawaawaa", OpExplode.INSTANCE),
|
||||
new Pair<>("weeewdq", OpAddMotion.INSTANCE),
|
||||
|
||||
// == Meta stuff ==
|
||||
new Pair<>("qqq", SpellWidget.OPEN_PAREN),
|
||||
new Pair<>("eee", SpellWidget.CLOSE_PAREN),
|
||||
new Pair<>("qqqaw", SpellWidget.ESCAPE),
|
||||
// http://www.toroidalsnark.net/mkss3-pix/CalderheadJMM2014.pdf
|
||||
// eval being a space filling curve feels apt doesn't it
|
||||
new Pair<>("deaqq", OpEval.INSTANCE),
|
||||
new Pair<>("aqqqqq", OpReadFromSpellbook.INSTANCE),
|
||||
new Pair<>("deeeee", OpWriteToSpellbook.INSTANCE),
|
||||
}) {
|
||||
PatternRegistry.addRegularPattern(p.getFirst(), p.getSecond());
|
||||
count++;
|
||||
}
|
||||
} catch (PatternRegistry.RegisterPatternException exn) {
|
||||
exn.printStackTrace();
|
||||
}
|
||||
|
||||
// Add zilde->number
|
||||
PatternRegistry.addSpecialHandler(pat -> {
|
||||
var sig = pat.anglesSignature();
|
||||
if (sig.startsWith("aqaa") || sig.startsWith("dedd")) {
|
||||
var negate = sig.startsWith("dedd");
|
||||
var accumulator = 0.0;
|
||||
for (char ch : sig.substring(4).toCharArray()) {
|
||||
if (ch == 'w') {
|
||||
accumulator += 1;
|
||||
} else if (ch == 'q') {
|
||||
accumulator += 5;
|
||||
} else if (ch == 'e') {
|
||||
accumulator += 10;
|
||||
} else if (ch == 'a') {
|
||||
accumulator *= 2;
|
||||
} else if (ch == 'd') {
|
||||
accumulator /= 2;
|
||||
}
|
||||
}
|
||||
if (negate) {
|
||||
accumulator = -accumulator;
|
||||
}
|
||||
return SpellOperator.makeConstantOp(SpellDatum.make(accumulator));
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
});
|
||||
|
||||
HexMod.LOGGER.info("Registered {} patterns", count);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in a new issue