Anvilcraft/HexCasting
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

some minor tag changes

Browse source
This commit is contained in:
yrsegal@gmail.com 2022-06-02 11:45:46 -04:00
parent 69b7177ee6
commit b25cffd814
9 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Common/src/main/java/at/petrak/hexcasting/api/advancements/HexAdvancementTriggers.java
View file

@ -1,6 +1,6 @@
package at.petrak.hexcasting.api.advancements;
import at.petrak.hexcasting.ktxt.AccessorWrappers;
import at.petrak.hexcasting.mixin.accessor.CriteriaTriggersAccessor;
public class HexAdvancementTriggers {
public static final OvercastTrigger OVERCAST_TRIGGER = new OvercastTrigger();
@ -8,8 +8,8 @@ public class HexAdvancementTriggers {
public static final FailToCastGreatSpellTrigger FAIL_GREAT_SPELL_TRIGGER = new FailToCastGreatSpellTrigger();
public static void registerTriggers() {
AccessorWrappers.registerCriteriaTrigger(OVERCAST_TRIGGER);
AccessorWrappers.registerCriteriaTrigger(SPEND_MANA_TRIGGER);
AccessorWrappers.registerCriteriaTrigger(FAIL_GREAT_SPELL_TRIGGER);
CriteriaTriggersAccessor.hex$register(OVERCAST_TRIGGER);
CriteriaTriggersAccessor.hex$register(SPEND_MANA_TRIGGER);
CriteriaTriggersAccessor.hex$register(FAIL_GREAT_SPELL_TRIGGER);
}
}

6
Common/src/main/java/at/petrak/hexcasting/ktxt/AccessorWrappers.kt
View file

@ -4,8 +4,6 @@ package at.petrak.hexcasting.ktxt
import at.petrak.hexcasting.mixin.accessor.AccessorLivingEntity
import at.petrak.hexcasting.mixin.accessor.AccessorUseOnContext
import at.petrak.hexcasting.mixin.accessor.AccessorVillager
import at.petrak.hexcasting.mixin.accessor.CriteriaTriggersAccessor
import net.minecraft.advancements.CriterionTrigger
import net.minecraft.world.InteractionHand
import net.minecraft.world.entity.Entity
import net.minecraft.world.entity.LivingEntity
@ -22,10 +20,6 @@ var LivingEntity.lastHurt: Float
fun Villager.tellWitnessesThatIWasMurdered(murderer: Entity) = (this as AccessorVillager).`hex$tellWitnessesThatIWasMurdered`(murderer)
fun Villager.releaseAllPois() = (this as AccessorVillager).`hex$releaseAllPois`()
fun <T : CriterionTrigger<*>> registerCriteriaTrigger(trigger: T): T = CriteriaTriggersAccessor.`hex$register`(trigger)
@Suppress("FunctionName")
fun UseOnContext(level: Level, player: Player?, hand: InteractionHand, stack: ItemStack, hitResult: BlockHitResult): UseOnContext =
AccessorUseOnContext.`hex$new`(level, player, hand, stack, hitResult)

4
Fabric/src/generated/resources/data/hexcasting/tags/items/wands.json
View file

@ -1,6 +1,7 @@
{
"replace": false,
"values": [
"hexcasting:wand_akashic",
"hexcasting:wand_oak",
"hexcasting:wand_spruce",
"hexcasting:wand_birch",
@ -8,7 +9,6 @@
"hexcasting:wand_acacia",
"hexcasting:wand_dark_oak",
"hexcasting:wand_crimson",
"hexcasting:wand_warped",
"hexcasting:wand_akashic"
"hexcasting:wand_warped"
]
}

4
Fabric/src/main/java/at/petrak/hexcasting/fabric/xplat/FabricXplatImpl.java
View file

@ -17,7 +17,7 @@ import at.petrak.hexcasting.fabric.interop.gravity.GravityApiInterop;
import at.petrak.hexcasting.fabric.recipe.FabricUnsealedIngredient;
import at.petrak.hexcasting.interop.HexInterop;
import at.petrak.hexcasting.interop.pehkui.PehkuiInterop;
import at.petrak.hexcasting.ktxt.AccessorWrappers;
import at.petrak.hexcasting.mixin.accessor.AccessorVillager;
import at.petrak.hexcasting.xplat.IXplatAbstractions;
import at.petrak.hexcasting.xplat.IXplatTags;
import at.petrak.hexcasting.xplat.Platform;
@ -129,7 +129,7 @@ public class FabricXplatImpl implements IXplatAbstractions {
mob.removeFreeWill();
if (mob instanceof Villager villager) {
AccessorWrappers.releaseAllPois(villager);
((AccessorVillager) villager).hex$releaseAllPois();
}
}

3
Fabric/src/main/resources/assets/emi/models/item/tag/hexcasting/akashic_logs.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "hexcasting:item/akashic_log"
}

3
Fabric/src/main/resources/assets/emi/models/item/tag/hexcasting/akashic_planks.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "hexcasting:item/akashic_planks"
}

3
Fabric/src/main/resources/assets/emi/models/item/tag/hexcasting/phial_base.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "hexcasting:item/phial_medium_0"
}

3
Fabric/src/main/resources/assets/emi/models/item/tag/hexcasting/wands.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "hexcasting:item/wand_akashic"
}

4
Forge/src/main/java/at/petrak/hexcasting/forge/xplat/ForgeXplatImpl.java
View file

@ -22,7 +22,7 @@ import at.petrak.hexcasting.forge.network.MsgBrainsweepAck;
import at.petrak.hexcasting.forge.recipe.ForgeUnsealedIngredient;
import at.petrak.hexcasting.interop.HexInterop;
import at.petrak.hexcasting.interop.pehkui.PehkuiInterop;
import at.petrak.hexcasting.ktxt.AccessorWrappers;
import at.petrak.hexcasting.mixin.accessor.AccessorVillager;
import at.petrak.hexcasting.xplat.IXplatAbstractions;
import at.petrak.hexcasting.xplat.IXplatTags;
import at.petrak.hexcasting.xplat.Platform;
@ -113,7 +113,7 @@ public class ForgeXplatImpl implements IXplatAbstractions {
mob.removeFreeWill();
if (mob instanceof Villager villager) {
AccessorWrappers.releaseAllPois(villager);
((AccessorVillager) villager).hex$releaseAllPois();
}
if (mob.level instanceof ServerLevel) {