merge

.github/workflows/publish.yml

@@ -1,5 +1,4 @@
-
-name: Publish on GitHub, CurseForge and Modrinth
+name: Publish action
 
 on:
  workflow_dispatch:
@@ -14,42 +13,36 @@ env:
  MINECRAFT_VERSION: 1.19.2
  JAVA_VERSION: 17
 
-permissions:
- contents: write
-
 jobs:
  build:
  runs-on: ubuntu-latest
 
  steps:
- - uses: actions/checkout@v3
- - name: Set up JDK ${{ env.JAVA_VERSION }}
- uses: actions/setup-java@v3
- with:
- java-version: ${{ env.JAVA_VERSION }}
- distribution: 'temurin'
- - shell: bash
- env:
- VERSION: ${{ inputs.version }}
- run: |
- echo "$VERSION" > version
- mkdir -p ~/.gradle/caches/fabric-loom/assets
- - name: Setup and Build with Gradle
- uses: gradle/gradle-build-action@v2
- with:
- arguments: clean runData build
- - uses: GuillaumeFalourd/[email protected]
- with:
- commit_message: "ci: bump version"
- - uses: Kir-Antipov/[email protected]
- with:
- modrinth-id: TKB6INcv
- modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
- curseforge-id: 401955
- curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
- github-token: ${{ secrets.GITHUB_TOKEN }}
- name: ars_artifice-${{ env.MINECRAFT_VERSION }}-${{ inputs.version }}
- version: ${{ inputs.version }}
- game-versions: |
- ${{ env.MINECRAFT_VERSION }}
- version-resolver: exact
+ - name: checkout repository
+ uses: actions/checkout@v2
+ - name: validate gradle wrapper
+ uses: gradle/wrapper-validation-action@v1
+ - name: setup jdk 17
+ uses: actions/setup-java@v1
+ with:
+ java-version: "17"
+ - name: make gradle wrapper executable
+ if: ${{ runner.os != 'Windows' }}
+ run: chmod +x ./gradlew
+ - name: build
+ run: ./gradlew build
+ - name: Publish Minecraft Mods Forge
+ uses: Kir-Antipov/[email protected]
+ with:
+ curseforge-id: 401955
+ modrinth-id: TKB6INcv
+ curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+ modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+ files-primary: build/libs/!(*-@(dev|sources)).jar
+ files-secondary: build/libs/*-@(dev|sources).jar
+ version-type: release
+ loaders: forge
+ name: Ars Nouveau ${{ env.MINECRAFT_VERSION }}-${{ inputs.version }}
+ version: ars_nouveau-${{ env.MINECRAFT_VERSION }}-${{ inputs.version }}
+ game-version: ${{ env.MINECRAFT_VERSION }}
+ changelog: ""

build.gradle

@@ -27,9 +27,6 @@ apply plugin: 'org.parchmentmc.librarian.forgegradle'
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 
-
-
-
 version = '4.3.0'
 //configurations {
 // library
@@ -133,11 +130,6 @@ repositories {
  maven {
  url = "https://maven.theillusivec4.top/"
  }
- maven {
- // location of the maven that hosts JEI files
- name = "Progwml6 maven"
- url = "https://dvs1.progwml6.com/files/maven/"
- }
  maven {
  // location of a maven mirror for JEI files, as a fallback
  name = "ModMaven"

gradlew

@@ -61,7 +61,7 @@
 # You can find Gradle at https://github.com/gradle/gradle/.
 #
 ##############################################################################
-
+ 
 # Attempt to set APP_HOME
 
 # Resolve links: $0 may be a link

src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8

@@ -1,2 +1,2 @@
-// 1.20.1 2023-08-12T11:44:12.0217754 Languages: en_us
-8b81f21b9e4b2c604392e84487004ea62cefadee assets/ars_nouveau/lang/en_us.json
+// 1.20.1 2023-09-13T20:59:28.615354 Languages: en_us
+abc74840f0a67421e1877e6033317db703052f98 assets/ars_nouveau/lang/en_us.json

src/generated/resources/.cache/cdae075e2d4d58384fe4d2075f6d5323fe5baa69

@@ -1,15 +1,17 @@
-// 1.20.1 2023-07-30T20:06:18.1165342 Ars Nouveau Caster Tomes Datagen
+// 1.20.1 2023-09-13T20:59:28.6098389 Ars Nouveau Caster Tomes Datagen
 03612483f2b5f8c1191114ed781138786181be57 data/ars_nouveau/recipes/tomes/alex_tome.json
 0d1b2858202771fd4b58617683b289e24c5f5a3e data/ars_nouveau/recipes/tomes/arachne_tome.json
 9454b36c4f6eed0a7426d8b21005a1a7e77bddbf data/ars_nouveau/recipes/tomes/aurellia_tome.json
 f1b7db221c94faea04dcd9e17a1c40d7534b07e8 data/ars_nouveau/recipes/tomes/bailey_tome.json
 3ebb6c38e24a601bd970c0197bcb61926651b9b3 data/ars_nouveau/recipes/tomes/chems_tome.json
+b03f73e7fcac06bae8f72a0242280274e2d42075 data/ars_nouveau/recipes/tomes/darkfira_tome.json
 a5d5c79434903fcd6908a4e1aa442d45805a30c0 data/ars_nouveau/recipes/tomes/farfalla_tome.json
 051c71fa71c00992eb1ac9b967ef6f45fa34a7fe data/ars_nouveau/recipes/tomes/fireball_tome.json
 444c18beb3680140b8d93a5a713c36fa2269f401 data/ars_nouveau/recipes/tomes/glow_tome.json
 708cd8ea76505cc6f60eedb308a3bd800ba9b1e5 data/ars_nouveau/recipes/tomes/gootastic_tome.json
+4ffafbca95050aa5833ec631229a50c4bf4d756a data/ars_nouveau/recipes/tomes/ivy_tome.json
 99d3d26cbdb37cae3f0dc157de73cba337ab4559 data/ars_nouveau/recipes/tomes/kirin_tome.json
-62958875484aed4135c22029c971f34593dd4be7 data/ars_nouveau/recipes/tomes/othy_tome.json
+60c43b9b72996adbd596dd79b577ec1e4a65dca1 data/ars_nouveau/recipes/tomes/othy_tome.json
 4b265a90b7475d41e0d100376cd13e506131b8e7 data/ars_nouveau/recipes/tomes/poseidon_tome.json
 0a4709a99d48f1fa2bdf5afc6071f36860a442d8 data/ars_nouveau/recipes/tomes/renew_rune_tome.json
 767fc4726df794a93a3761775499993ae1ef0bce data/ars_nouveau/recipes/tomes/shadow_tome.json

src/generated/resources/assets/ars_nouveau/lang/en_us.json

@@ -426,7 +426,7 @@
  "ars_nouveau.page.dominion_wand": "A tool for configuring Source Relays and automation entities. To set a transfer path, use the wand on the object that you would like to take source from, and then use it on the block you would like to send source to. For example: Source Jar to Source Relay, Source Relay to Source Relay, or Source Relay to Source Jar. To clear connections, sneak and use this wand on a relay.",
  "ars_nouveau.page.dowsing_rod": "A Dowsing Rod provides the user a short duration of Scrying for Budding Amethyst and Magic Find, which will cause magical creatures to glow within 75 blocks of you. The Dowsing Rod has a limited number of uses.",
  "ars_nouveau.page.enchanters_eye": "A caster tool that can cast inscribed spells remotely through a Scry Crystal. Use the eye on a Scry Crystal to bind the location, or hold a bound Scry Parchment in the offhand. Spells will be cast through the eye similar to a Spell Turret, but you are considered the caster for all effects. Useful for remote teleportation or item movement.",
- "ars_nouveau.page.enchanters_mirror": "Applies a self spell to the user. Spells cast with this mirror are discounted and gain additional bonus duration to all glyphs. Apply a spell at the Scribe's table that DOES NOT contain a form such as Strength -> Heal.",
+ "ars_nouveau.page.enchanters_mirror": "Applies a self spell to the user. Spells cast with this mirror are discounted and gain additional bonus duration to all glyphs. Apply a spell at the Scribe's table that DOES NOT contain a form such as Heal -> Amplify.",
  "ars_nouveau.page.enchanters_shield": "Upon blocking damage, the user will gain a short duration of Mana Regeneration and Spell Damage. Additionally, this shield will repair over time using the wearers mana.",
  "ars_nouveau.page.enchanters_sword": "Applies a Touch spell before damaging an entity. Additionally, all spells gain one additional Amplify augment on the last effect in the spell. Apply a spell at the Scribes Table that does NOT contain a form, such as Ignite -> Extend Time.",
  "ars_nouveau.page.flask_cannons": "Flask Cannons",

src/generated/resources/data/ars_nouveau/loot_tables/blocks/source_jar.json

@@ -14,11 +14,6 @@
  {
  "function": "minecraft:copy_nbt",
  "ops": [
- {
- "op": "replace",
- "source": "inv",
- "target": "BlockEntityTag.inv"
- },
  {
  "op": "replace",
  "source": "source",

src/generated/resources/data/ars_nouveau/recipes/tomes/darkfira_tome.json

@@ -0,0 +1,24 @@
+{
+ "type": "ars_nouveau:caster_tome",
+ "color": 1703935,
+ "flavour_text": "Encases your enemies or friends in a tomb of ice. Guaranteed to leave them shocked and confused.",
+ "name": "Darkfira's Flash Freeze",
+ "sound": {
+ "family": "ars_nouveau:tempestry_family",
+ "pitch": 1.9,
+ "volume": 1.69
+ },
+ "spell": [
+ "ars_nouveau:glyph_projectile",
+ "ars_nouveau:burst",
+ "ars_nouveau:glyph_sensitive",
+ "ars_nouveau:glyph_aoe",
+ "ars_nouveau:glyph_aoe",
+ "ars_nouveau:glyph_aoe",
+ "ars_nouveau:glyph_conjure_water",
+ "ars_nouveau:glyph_freeze",
+ "ars_nouveau:glyph_lightning",
+ "ars_nouveau:glyph_amplify"
+ ],
+ "tome_type": "ars_nouveau:caster_tome"
+}

src/generated/resources/data/ars_nouveau/recipes/tomes/ivy_tome.json

@@ -0,0 +1,24 @@
+{
+ "type": "ars_nouveau:caster_tome",
+ "color": 16738740,
+ "flavour_text": "Now you never have to be lonely again! You will always have a friend with you! Feel free to change their name to whatever you want! :D",
+ "name": "Ivy",
+ "sound": {
+ "family": "ars_nouveau:fire_family",
+ "pitch": 1.0,
+ "volume": 1.0
+ },
+ "spell": [
+ "ars_nouveau:glyph_touch",
+ "ars_nouveau:glyph_animate_block",
+ "ars_nouveau:glyph_extend_time",
+ "ars_nouveau:glyph_extend_time",
+ "ars_nouveau:glyph_extend_time",
+ "ars_nouveau:glyph_extend_time",
+ "ars_nouveau:glyph_extend_time",
+ "ars_nouveau:glyph_extend_time",
+ "ars_nouveau:glyph_extend_time",
+ "ars_nouveau:glyph_name"
+ ],
+ "tome_type": "ars_nouveau:caster_tome"
+}

src/generated/resources/data/ars_nouveau/recipes/tomes/othy_tome.json

@@ -2,20 +2,19 @@
  "type": "ars_nouveau:caster_tome",
  "color": 16777215,
  "flavour_text": "Swarm your enemies with bladed spirits.",
- "name": "Othy's Death By 100 Pricks",
+ "name": "Othy's Misdirection",
  "sound": {
  "family": "ars_nouveau:fire_family",
  "pitch": 1.0,
  "volume": 1.0
  },
  "spell": [
- "ars_nouveau:glyph_projectile",
- "ars_nouveau:glyph_pierce",
- "ars_nouveau:glyph_pierce",
- "ars_nouveau:glyph_linger",
- "ars_nouveau:glyph_sensitive",
- "ars_nouveau:glyph_summon_vex",
- "ars_nouveau:glyph_extend_time"
+ "ars_nouveau:glyph_self",
+ "ars_nouveau:glyph_extend_time",
+ "ars_nouveau:glyph_summon_decoy",
+ "ars_nouveau:glyph_blink",
+ "ars_nouveau:glyph_amplify",
+ "ars_nouveau:glyph_amplify"
  ],
  "tome_type": "ars_nouveau:caster_tome"
 }

src/main/java/com/hollingsworth/arsnouveau/api/spell/SpellResolver.java

@@ -204,6 +204,10 @@ public void expendMana() {
  CapabilityRegistry.getMana(spellContext.getUnwrappedCaster()).ifPresent(mana -> mana.removeMana(totalCost));
  }
 
+ /**
+ * Simulates the cost required to cast a spell
+ * When expending mana, please call getResolveCostAndResetDiscounts instead
+ */
  public int getResolveCost() {
  int cost = spellContext.getSpell().getCost() - getPlayerDiscounts(spellContext.getUnwrappedCaster(), spell, spellContext.getCasterTool());
  SpellCostCalcEvent event = new SpellCostCalcEvent(spellContext, cost);

src/main/java/com/hollingsworth/arsnouveau/common/block/tile/MycelialSourcelinkTile.java

@@ -65,7 +65,9 @@ public void tick() {
  public int getSourceValue(ItemStack i) {
  if (i.getItem().isEdible()) {
  int mana = 0;
- FoodProperties food = i.getItem().getFoodProperties();
+ FoodProperties food = i.getItem().getFoodProperties(i, null);
+ if(food == null)
+ return 0;
  mana += 11 * food.getNutrition();
  mana += 30 * food.getSaturationModifier();
  progress += 1;

src/main/java/com/hollingsworth/arsnouveau/common/datagen/CasterTomeProvider.java

@@ -157,13 +157,12 @@ public void collectJsons(CachedOutput pOutput) {
  .add(AugmentExtendTime.INSTANCE, 4)
  .add(AugmentAmplify.INSTANCE), "Light up the sky", new ParticleColor(25, 255, 255)));
 
- tomes.add(buildTome("othy", "Othy's Death By 100 Pricks", new Spell()
- .add(MethodProjectile.INSTANCE)
- .add(AugmentPierce.INSTANCE, 2)
- .add(EffectLinger.INSTANCE)
- .add(AugmentSensitive.INSTANCE)
- .add(EffectSummonVex.INSTANCE)
- .add(AugmentExtendTime.INSTANCE), "Swarm your enemies with bladed spirits.", new ParticleColor(255, 255, 255)));
+ tomes.add(buildTome("othy", "Othy's Misdirection", new Spell()
+ .add(MethodSelf.INSTANCE)
+ .add(AugmentExtendTime.INSTANCE)
+ .add(EffectSummonDecoy.INSTANCE)
+ .add(EffectBlink.INSTANCE)
+ .add(AugmentAmplify.INSTANCE, 2), "Swarm your enemies with bladed spirits.", new ParticleColor(255, 255, 255)));
 
  tomes.add(buildTome("aurellia", "Aurellia's Bite Storm", new Spell()
  .add(MethodProjectile.INSTANCE)
@@ -209,6 +208,24 @@ public void collectJsons(CachedOutput pOutput) {
  .add(EffectLaunch.INSTANCE, 4),
  "Smothers an area with runes that launch entities upward. Do NOT get covered in the Repulsion Runes.", new ParticleColor(61, 207, 248)));
 
+
+ tomes.add(buildTome("ivy", "Ivy", new Spell(MethodTouch.INSTANCE)
+ .add(EffectAnimate.INSTANCE)
+ .add(AugmentExtendTime.INSTANCE, 7)
+ .add(EffectName.INSTANCE), "Now you never have to be lonely again! You will always have a friend with you! Feel free to change their name to whatever you want! :D",
+ new ParticleColor(255, 105, 180)));
+
+ tomes.add(buildTome("darkfira","Darkfira's Flash Freeze", new Spell(MethodProjectile.INSTANCE)
+ .add(EffectBurst.INSTANCE)
+ .add(AugmentSensitive.INSTANCE)
+ .add(AugmentAOE.INSTANCE, 3)
+ .add(EffectConjureWater.INSTANCE)
+ .add(EffectFreeze.INSTANCE)
+ .add(EffectLightning.INSTANCE)
+ .add(AugmentAmplify.INSTANCE)
+ .withSound(new ConfiguredSpellSound(SoundRegistry.TEMPESTRY_SPELL_SOUND, 1.69f, 1.9f)), "Encases your enemies or friends in a tomb of ice. Guaranteed to leave them shocked and confused.",
+ new ParticleColor(25, 255, 255)));
+
  for (CasterTomeData g : tomes) {
  Path path = getRecipePath(output, g.getId().getPath());
  saveStable(pOutput, g.toJson(), path);

src/main/java/com/hollingsworth/arsnouveau/common/entity/goal/carbuncle/StarbyTransportBehavior.java

@@ -1,5 +1,7 @@
 package com.hollingsworth.arsnouveau.common.entity.goal.carbuncle;
 
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 import com.hollingsworth.arsnouveau.ArsNouveau;
 import com.hollingsworth.arsnouveau.common.entity.Starbuncle;
 import com.hollingsworth.arsnouveau.common.items.ItemScroll;
@@ -28,8 +30,13 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 public class StarbyTransportBehavior extends StarbyListBehavior {
+ public static Cache<BlockPos, List<ItemEntity>> frameCache = CacheBuilder.newBuilder()
+ .expireAfterAccess(20, TimeUnit.SECONDS)
+ .build();
+
  public static final ResourceLocation TRANSPORT_ID = new ResourceLocation(ArsNouveau.MODID, "starby_transport");
 
  public ItemStack itemScroll;
@@ -91,6 +98,9 @@ public BlockPos getValidStorePos(ItemStack stack) {
  if (pref.ordinal() > foundPref.ordinal()) {
  foundPref = pref;
  returnPos = b;
+ if(foundPref == ItemScroll.SortPref.HIGHEST){
+ return returnPos;
+ }
  }
  }
  return returnPos;

src/main/java/com/hollingsworth/arsnouveau/common/items/CasterTome.java

@@ -3,10 +3,8 @@
 import com.hollingsworth.arsnouveau.api.item.ICasterTool;
 import com.hollingsworth.arsnouveau.api.spell.ISpellCaster;
 import com.hollingsworth.arsnouveau.api.spell.Spell;
-import net.minecraft.ChatFormatting;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.Style;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResultHolder;
 import net.minecraft.world.entity.player.Player;
@@ -46,9 +44,8 @@ public void appendHoverText(ItemStack stack, @Nullable Level worldIn, List<Compo
  return;
  ISpellCaster caster = getSpellCaster(stack);
  Spell spell = caster.getSpell();
- tooltip2.add(Component.literal(spell.getDisplayString()));
- if (!caster.getFlavorText().isEmpty())
- tooltip2.add(Component.literal(caster.getFlavorText()).withStyle(Style.EMPTY.withItalic(true).withColor(ChatFormatting.BLUE)));
+
+ getInformation(stack, worldIn, tooltip2, flagIn);
 
  tooltip2.add(Component.translatable("tooltip.ars_nouveau.caster_tome"));
  super.appendHoverText(stack, worldIn, tooltip2, flagIn);

src/main/java/com/hollingsworth/arsnouveau/common/mixin/structure/StructureTemplateMixin.java

@@ -19,7 +19,7 @@ public class StructureTemplateMixin {
  method = "placeInWorld(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructurePlaceSettings;Lnet/minecraft/util/RandomSource;I)Z",
  at = @At(value = "HEAD")
  )
- private void repurposedstructures_preventAutoWaterlogging(ServerLevelAccessor serverLevelAccessor, BlockPos blockPos1,
+ private void ars_nouveau_preventAutoWaterlogging(ServerLevelAccessor serverLevelAccessor, BlockPos blockPos1,
  BlockPos blockPos2, StructurePlaceSettings structurePlaceSettings,
  RandomSource random, int flag, CallbackInfoReturnable<Boolean> cir) {
 

src/main/resources/assets/ars_nouveau/lang/af_za.json

@@ -426,7 +426,7 @@
  "ars_nouveau.page.dominion_wand": "'n Gereedskap vir die opstel van Bronaflosse en outomatiseringsentiteite. Om 'n oordragpad te stel, gebruik die towerstaf op die voorwerp waarvan jy die bron wil neem, en gebruik dit dan op die blok waarna jy die bron wil stuur. Byvoorbeeld: Bron Kruik na Bron Relay, Bron Relay to Source Relay, of Bron Relay to Source Jar. Om verbindings skoon te maak, sluip en gebruik hierdie towerstaf op 'n aflos.",
  "ars_nouveau.page.dowsing_rod": "'n Wisselstafie bied die gebruiker 'n kort tydsduur van Skreeu vir ontluikende ametis en toorvind, wat magiese wesens binne 75 blokke van jou af sal laat gloei. Die Dowsing Rod het 'n beperkte aantal gebruike.",
  "ars_nouveau.page.enchanters_eye": "'n Caster-instrument wat ingeskrewe towerspreuke op afstand deur 'n Scry Crystal kan gooi. Gebruik die oog op 'n Scry Crystal om die plek vas te bind, of hou 'n gebonde Scry Perkament in die hand. Towerspreuke sal deur die oog gegooi word soortgelyk aan 'n Spell Turret, maar jy word beskou as die wapper vir alle effekte. Nuttig vir afstand teleportasie of item beweging.",
- "ars_nouveau.page.enchanters_mirror": "Pas 'n selfspel op die gebruiker toe. Towerspreuke wat met hierdie spieël uitgespreek word, kry afslag en kry bykomende bonustydperk vir alle glife. Pas 'n towerspreuk by die Skrifgeleerde se tafel toe wat NIE 'n vorm soos Sterkte -> Genees bevat NIE.",
+ "ars_nouveau.page.enchanters_mirror": "Applies a self spell to the user. Spells cast with this mirror are discounted and gain additional bonus duration to all glyphs. Apply a spell at the Scribe's table that DOES NOT contain a form such as Heal -> Heal.",
  "ars_nouveau.page.enchanters_shield": "By die blokkering van skade, sal die gebruiker 'n kort tydsduur van Mana Regeneration en Spell Skade kry. Boonop sal hierdie skild oor tyd herstel deur die draers mana te gebruik.",
  "ars_nouveau.page.enchanters_sword": "Pas 'n Touch-spel toe voordat 'n entiteit beskadig word. Boonop kry alle towerspreuke een bykomende versterkingsaanvulling op die laaste effek in die toorspel. Pas 'n towerspreuk by die Skrifgeleerdes Tabel toe wat NIE 'n vorm bevat nie, soos Ignite -> Verleng tyd.",
  "ars_nouveau.page.flask_cannons": "Fleskanonne",