petrak@
ede95c4b49
creeping towards compilation
2023-01-21 11:53:23 -06:00
petrak@
5d8b7a61eb
this does not compile even a little bit but i'm pushing so i'm not anxious having code on my HD
2023-01-20 13:27:35 -06:00
petrak@
7748cf7387
that sucked
2022-12-30 17:00:52 -05:00
petrak@
573fbb738a
oh god, this is gonna suck
2022-12-30 13:43:38 -05:00
petrak@
5f9ced55fc
clean up xplat
2022-12-30 13:07:21 -05:00
petrak@
bdbb8b0e83
MVP ready
2022-12-30 13:00:47 -05:00
petrak@
c3ebba18f0
finish logic for entity ingrs
2022-12-28 14:11:28 -05:00
petrak@
a0fde191d4
keep on mergin
2022-12-03 11:16:22 -05:00
petrak@
949e4bb292
fix #325
2022-11-29 15:24:44 -05:00
petrak@
9704ffe4ca
close #307 . real intelligent mistake there petra
2022-11-29 14:28:34 -05:00
petrak@
33ba0ee4e1
rrgh
2022-11-29 12:07:08 -05:00
petrak@
7c00cbaec8
possibly impl arbitrary brainsweeps. i don't know. i'm in offline mode
2022-11-22 19:31:09 -06:00
petrak@
30701702c7
Merge branch 'main' into arbitrary-brainsweeps
2022-11-22 09:44:20 -06:00
petrak@
f1f1f6aa7f
make cloth config mandatory
2022-11-22 09:44:13 -06:00
petrak@
274bec11d6
fix 292
2022-11-21 21:59:22 -06:00
petrak@
56d9f57033
rerun datagen
2022-11-21 19:55:39 -06:00
petrak@
76006d72dc
finish sound cleanup and also other things cleanup
2022-11-21 19:48:25 -06:00
petrak@
7699a5e468
start work on making sounds badnt
2022-11-21 17:55:36 -06:00
petrak@
3f9c3a4561
badn't config
2022-11-21 14:07:27 -06:00
petrak@
aecf017b06
fix conflicts
2022-11-21 12:20:56 -06:00
petrak@
9a276c70de
clip the end of the pattern line in certain cases for visibility
2022-11-20 22:38:35 -06:00
petrak@
ba42d97872
start work on arbitrary brainsweeps
2022-11-20 15:46:12 -06:00
petrak@
7dc05d2951
maybe fix #286
2022-11-19 21:21:42 -06:00
gamma-delta
c33b1eb8af
i am speed: add opt mods in dev on fabc
2022-11-15 23:26:35 -06:00
gamma-delta
9ca5738317
WITH CATLIKE TREAD! UPON OUR PREY WE STEAL! IN SILENCE DREAD! OUR CAUTIOUS WAY WE FEEL! NO SOUND AT ALL! WE NEVER SPEAK A WORD! A FLY'S FOOTFALL WOULD BE DISTINCTLY HEARD!
2022-11-15 21:09:30 -06:00
gamma-delta
03dd09c6de
amethyst dust now makes scrolls have the offset marks
2022-11-14 20:35:48 -06:00
gamma-delta
f42b44f029
fix #269
2022-11-14 19:26:11 -06:00
yrsegal@gmail.com
61e292af10
finish mana -> media
2022-11-09 19:50:37 -05:00
gamma-delta
05eaaf1d2a
prevent weird dev modmenu crash and update bool display
2022-11-06 12:47:28 -06:00
yrsegal@gmail.com
fde595a6ce
mother of all merges
2022-11-05 23:19:04 -04:00
yrsegal@gmail.com
a01ff27453
Merge branch 'main' into 1.0
...
# Conflicts:
# Common/src/generated/resources/.cache/cache
# Common/src/generated/resources/assets/hexcasting/models/block/conjured.json
# Common/src/main/java/at/petrak/hexcasting/api/PatternRegistry.kt
# Common/src/main/java/at/petrak/hexcasting/api/addldata/ManaHolder.java
# Common/src/main/java/at/petrak/hexcasting/api/block/circle/BlockEntityAbstractImpetus.java
# Common/src/main/java/at/petrak/hexcasting/api/item/ColorizerItem.java
# Common/src/main/java/at/petrak/hexcasting/api/item/DataHolderItem.java
# Common/src/main/java/at/petrak/hexcasting/api/item/HexHolderItem.java
# Common/src/main/java/at/petrak/hexcasting/api/item/ManaHolderItem.java
# Common/src/main/java/at/petrak/hexcasting/api/spell/Action.kt
# Common/src/main/java/at/petrak/hexcasting/api/spell/SpellDatum.kt
# Common/src/main/java/at/petrak/hexcasting/api/spell/Widget.kt
# Common/src/main/java/at/petrak/hexcasting/api/spell/casting/CastingContext.kt
# Common/src/main/java/at/petrak/hexcasting/api/spell/casting/CastingHarness.kt
# Common/src/main/java/at/petrak/hexcasting/api/spell/mishaps/MishapNoSpellCircle.kt
# Common/src/main/java/at/petrak/hexcasting/api/spell/mishaps/MishapNotEnoughArgs.kt
# Common/src/main/java/at/petrak/hexcasting/api/utils/ManaHelper.kt
# Common/src/main/java/at/petrak/hexcasting/client/RegisterClientStuff.java
# Common/src/main/java/at/petrak/hexcasting/client/ShiftScrollListener.java
# Common/src/main/java/at/petrak/hexcasting/client/gui/GuiSpellcasting.kt
# Common/src/main/java/at/petrak/hexcasting/common/blocks/akashic/BlockAkashicFloodfiller.java
# Common/src/main/java/at/petrak/hexcasting/common/blocks/entity/BlockEntityStoredPlayerImpetus.java
# Common/src/main/java/at/petrak/hexcasting/common/casting/RegisterPatterns.java
# Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpBlockAxisRaycast.kt
# Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpTheCoolerRead.kt
# Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpTheCoolerReadable.kt
# Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpWrite.kt
# Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpRemove.kt
# Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpPowProj.kt
# Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolIdentityKindOf.kt
# Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpBreakBlock.kt
# Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpConjureBlock.kt
# Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpCreateWater.kt
# Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpDestroyWater.kt
# Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpEdifySapling.kt
# Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpErase.kt
# Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpExplode.kt
# Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpExtinguish.kt
# Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpIgnite.kt
# Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpMakeBattery.kt
# Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpMakePackagedSpell.kt
# Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpPlaceBlock.kt
# Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpPotionEffect.kt
# Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpRecharge.kt
# Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpTheOnlyReasonAnyoneDownloadedPsi.kt
# Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/great/OpBrainsweep.kt
# Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/great/OpCreateLava.kt
# Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/great/OpTeleport.kt
# Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpAlwinfyHasAscendedToABeingOfPureMath.kt
# Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpMask.kt
# Common/src/main/java/at/petrak/hexcasting/common/command/ListPatternsCommand.java
# Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemCreativeUnlocker.java
# Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemMediaHolder.java
# Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlocks.java
# Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java
# Common/src/main/java/at/petrak/hexcasting/common/misc/AkashicTreeGrower.java
# Common/src/main/java/at/petrak/hexcasting/common/network/MsgNewSpellPatternAck.java
# Common/src/main/java/at/petrak/hexcasting/common/network/MsgShiftScrollSyn.java
# Common/src/main/java/at/petrak/hexcasting/datagen/HexAdvancements.java
# Common/src/main/java/at/petrak/hexcasting/datagen/HexItemTagProvider.java
# Common/src/main/java/at/petrak/hexcasting/datagen/recipe/HexplatRecipes.kt
# Common/src/main/java/at/petrak/hexcasting/mixin/accessor/client/AccessorMouseHandler.java
# Common/src/main/java/at/petrak/hexcasting/xplat/IXplatAbstractions.java
# Common/src/main/resources/assets/hexcasting/lang/en_us.json
# Fabric/gradle.properties
# Fabric/src/generated/resources/.cache/cache
# Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_black.json
# Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_blue.json
# Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_brown.json
# Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_cyan.json
# Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_gray.json
# Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_green.json
# Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_light_blue.json
# Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_light_gray.json
# Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_lime.json
# Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_magenta.json
# Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_orange.json
# Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_pink.json
# Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_purple.json
# Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_red.json
# Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_white.json
# Fabric/src/generated/resources/data/hexcasting/recipes/dye_colorizer_yellow.json
# Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_agender.json
# Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_aroace.json
# Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_aromantic.json
# Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_asexual.json
# Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_bisexual.json
# Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_demiboy.json
# Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_demigirl.json
# Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_gay.json
# Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_genderfluid.json
# Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_genderqueer.json
# Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_intersex.json
# Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_lesbian.json
# Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_nonbinary.json
# Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_pansexual.json
# Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_plural.json
# Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_transgender.json
# Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexClientInitializer.kt
# Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexConfig.java
# Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt
# Fabric/src/main/java/at/petrak/hexcasting/fabric/cc/CCDataHolder.java
# Fabric/src/main/java/at/petrak/hexcasting/fabric/cc/HexCardinalComponents.java
# Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/EmiBrainsweepRecipe.java
# Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/HexEMIPlugin.java
# Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/rei/BrainsweepRecipeCategory.java
# Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/rei/HexREIPlugin.java
# Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/rei/PatternRendererREI.java
# Fabric/src/main/java/at/petrak/hexcasting/fabric/recipe/FabricUnsealedIngredient.java
# Fabric/src/main/java/at/petrak/hexcasting/fabric/storage/FabricImpetusStorage.kt
# Fabric/src/main/java/at/petrak/hexcasting/fabric/xplat/FabricXplatImpl.java
# Fabric/src/main/resources/fabric.mod.json
# Forge/build.gradle
# Forge/gradle.properties
# Forge/src/generated/resources/.cache/cache
# Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_black.json
# Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_blue.json
# Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_brown.json
# Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_cyan.json
# Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_gray.json
# Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_green.json
# Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_light_blue.json
# Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_light_gray.json
# Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_lime.json
# Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_magenta.json
# Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_orange.json
# Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_pink.json
# Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_purple.json
# Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_red.json
# Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_white.json
# Forge/src/generated/resources/data/hexcasting/recipes/dye_colorizer_yellow.json
# Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_agender.json
# Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_aroace.json
# Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_aromantic.json
# Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_asexual.json
# Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_bisexual.json
# Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_demiboy.json
# Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_demigirl.json
# Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_gay.json
# Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_genderfluid.json
# Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_genderqueer.json
# Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_intersex.json
# Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_lesbian.json
# Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_nonbinary.json
# Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_pansexual.json
# Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_plural.json
# Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_transgender.json
# Forge/src/main/java/at/petrak/hexcasting/forge/ForgeHexClientInitializer.java
# Forge/src/main/java/at/petrak/hexcasting/forge/ForgeHexConfig.java
# Forge/src/main/java/at/petrak/hexcasting/forge/ForgeHexInitializer.java
# Forge/src/main/java/at/petrak/hexcasting/forge/cap/ForgeCapabilityHandler.java
# Forge/src/main/java/at/petrak/hexcasting/forge/cap/ForgeImpetusCapability.java
# Forge/src/main/java/at/petrak/hexcasting/forge/datagen/HexForgeDataGenerators.java
# Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexBlockStatesAndModels.java
# Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/HexJEIPlugin.java
# Forge/src/main/java/at/petrak/hexcasting/forge/recipe/ForgeUnsealedIngredient.java
# Forge/src/main/java/at/petrak/hexcasting/forge/xplat/ForgeXplatImpl.java
# Forge/src/main/resources/META-INF/accesstransformer.cfg
# gradle.properties
2022-11-05 21:49:59 -04:00
yrsegal@gmail.com
63495a423f
unify tabs (this will make the merge about 1000x easier)
2022-11-05 21:16:22 -04:00
yrsegal@gmail.com
95b78b551b
fix #162
2022-11-05 15:30:38 -04:00
yrsegal@gmail.com
b9c0ced020
fix poitype change to predicate
2022-11-05 13:09:30 -04:00
gamma-delta
e5a077f67e
it compiles on fabc!
2022-11-04 18:21:08 +01:00
gamma-delta
d148552a81
*now* it's compiling, at least on forge
2022-11-04 17:31:18 +01:00
gamma-delta
7c65777e22
it compiles!
2022-11-03 18:29:48 +01:00
gamma-delta
e3c5321426
start getting on 1.19
2022-11-03 16:31:05 +01:00
gamma-delta
5a8f8317c9
port lookup to java
2022-11-02 15:49:49 +01:00
yrsegal@gmail.com
5193a20a0a
Another debug cube feature
2022-10-17 21:53:19 -04:00
yrsegal@gmail.com
1d6bb87864
Close #123
2022-10-01 12:52:37 -04:00
yrsegal@gmail.com
c3184afb28
fix #248
2022-09-30 21:00:30 -04:00
gamma-delta
4acfc707a7
bang on #253 . this in no way fixes it and i'm halfway convinced it's a FD error
2022-09-22 09:18:19 -05:00
petrak@
d327d4d943
Merge branch 'main' into fix173+175
2022-08-28 22:11:54 -05:00
gamma-delta
a092047e33
Clean up some advancements.
...
- Root now accepts any of the 3 denominations of amethyst
- Changed some wordings to hint at how to achieve enlightenment in the
advancmenets
- Remove some ableist language
2022-08-28 21:46:05 -05:00
yrsegal@gmail.com
240f021194
Fluid creation hexes can insert partial, destroy fluid can drain tanks
...
Closes #216
2022-08-25 21:09:51 -04:00
yrsegal@gmail.com
7e780b5dca
Fix an issue with the pan recipe
2022-08-25 14:02:15 -04:00
yrsegal@gmail.com
63be2d9a96
fix annotations not compiling
2022-08-18 17:18:16 -04:00
yrsegal@gmail.com
1afd21b5bb
ManaHolders can now control recharging
2022-08-18 16:12:18 -04:00
yrsegal@gmail.com
bde6f9ad59
fix all the CC crashes
2022-08-17 08:13:48 -04:00
