diff --git a/build.gradle b/build.gradle index c1b639a..c21765b 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ apply plugin: 'eclipse' apply plugin: 'maven-publish' apply plugin: "com.wynprice.cursemaven" apply plugin: 'org.spongepowered.mixin' -version = '1.16.4-1.0.3' +version = '1.16.4-1.0.4' group = 'com.minttea.tomeofblood' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'tomeofblood' @@ -125,8 +125,8 @@ dependencies { runtimeOnly fg.deobf("curse.maven:curios:3122651") compileOnly fg.deobf("curse.maven:patchouli:3126931") runtimeOnly fg.deobf("curse.maven:patchouli:3126931") - compileOnly fg.deobf("curse.maven:ars-noveau:3173254") - runtimeOnly fg.deobf("curse.maven:ars-noveau:3173254") + compileOnly fg.deobf("curse.maven:ars-noveau:3174543") + runtimeOnly fg.deobf("curse.maven:ars-noveau:3174543") compileOnly fg.deobf("curse.maven:blood-magic:3149693") runtimeOnly fg.deobf("curse.maven:blood-magic:3149693") diff --git a/src/main/java/com/minttea/tomeofblood/client/renderer/item/TomeRenderer.java b/src/main/java/com/minttea/tomeofblood/client/renderer/item/TomeRenderer.java deleted file mode 100644 index 9b87bab..0000000 --- a/src/main/java/com/minttea/tomeofblood/client/renderer/item/TomeRenderer.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.minttea.tomeofblood.client.renderer.item; - -import com.hollingsworth.arsnouveau.client.renderer.item.SpellBookModel; -import com.minttea.tomeofblood.TomeOfBloodMod; -import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.vertex.IVertexBuilder; -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.color.ItemColors; -import net.minecraft.client.renderer.model.ItemCameraTransforms; -import net.minecraft.client.renderer.model.ModelManager; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.vector.Vector3f; - -public class TomeRenderer extends ItemStackTileEntityRenderer { - public final SpellBookModel model = new SpellBookModel(); - public static final ResourceLocation tome = new ResourceLocation(TomeOfBloodMod.MODID + ":textures/entity/tome_of_blood_final.png"); - - public TomeRenderer(){ } - - @Override - public void func_239207_a_(ItemStack stack, ItemCameraTransforms.TransformType p_239207_2_, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) - { - ms.push(); - ms.translate(0.5,1,1); - ms.scale(0.5f,0.5f,0.5f); - ms.rotate(Vector3f.XP.rotation(180)); - IVertexBuilder buffer = buffers.getBuffer(model.getRenderType(tome)); - model.render(ms, buffer,light,overlay, 1,1,1,1,1); - ms.pop(); - } - - public SpellBookModel getModel() - { - return model; - } -} diff --git a/src/main/java/com/minttea/tomeofblood/common/events/LivingArmorManaBonus.java b/src/main/java/com/minttea/tomeofblood/common/events/LivingArmorManaBonus.java index 28d25b2..0bd721d 100644 --- a/src/main/java/com/minttea/tomeofblood/common/events/LivingArmorManaBonus.java +++ b/src/main/java/com/minttea/tomeofblood/common/events/LivingArmorManaBonus.java @@ -37,22 +37,14 @@ public static void awardSpellCastArmourUpgrade(SpellCastEvent event) stats.addExperience(new ResourceLocation("tomeofblood", "mana_bonus"), xpAward); LOGGER.debug("Arcane Attunement level ", stats.getLevel(new ResourceLocation("tomeofblood", "mana_bonus"))); LivingStats.toPlayer(player, stats); - if(stats) + if(stats != null) + { + int level = stats.getLevel(new ResourceLocation("tomeofblood", "mana_bonus")); + float discount = 1-(float) level / 10; + spell.setCost((int) discount); + } } } } - @SubscribeEvent - public static void maxManaForArmor(MaxManaCalcEvent event) - { - PlayerEntity player = (PlayerEntity) event.getEntity(); - LivingStats stats = LivingStats.fromPlayer(player); - if(stats != null) { - double max = event.getMax(); - int level = stats.getLevel(new ResourceLocation("tomeofblood", "mana_bonus")); - float manaBonus = 1 + (float) level / 10; - event.setMax((int) (max * manaBonus)); - } - - } } diff --git a/src/main/java/com/minttea/tomeofblood/common/items/BloodTome.java b/src/main/java/com/minttea/tomeofblood/common/items/BloodTome.java index 8492a6a..fb32dad 100644 --- a/src/main/java/com/minttea/tomeofblood/common/items/BloodTome.java +++ b/src/main/java/com/minttea/tomeofblood/common/items/BloodTome.java @@ -1,15 +1,7 @@ package com.minttea.tomeofblood.common.items; -import com.hollingsworth.arsnouveau.api.client.IDisplayMana; -import com.hollingsworth.arsnouveau.api.item.IScribeable; -import com.hollingsworth.arsnouveau.api.spell.AbstractSpellPart; -import com.hollingsworth.arsnouveau.api.spell.ISpellTier; import com.hollingsworth.arsnouveau.api.spell.SpellContext; -import com.hollingsworth.arsnouveau.api.spell.SpellResolver; import com.hollingsworth.arsnouveau.api.util.MathUtil; -import com.hollingsworth.arsnouveau.api.util.SpellRecipeUtil; -import com.hollingsworth.arsnouveau.client.keybindings.ModKeyBindings; -import com.hollingsworth.arsnouveau.client.particle.ParticleColor; import com.hollingsworth.arsnouveau.common.block.tile.IntangibleAirTile; import com.hollingsworth.arsnouveau.common.block.tile.PhantomBlockTile; import com.hollingsworth.arsnouveau.common.block.tile.ScribesTile; @@ -17,45 +9,23 @@ import com.hollingsworth.arsnouveau.common.items.SpellBook; import com.hollingsworth.arsnouveau.common.network.Networking; import com.hollingsworth.arsnouveau.common.network.PacketOpenSpellBook; -import com.hollingsworth.arsnouveau.common.util.PortUtil; -import com.minttea.tomeofblood.TomeOfBloodMod; -import com.minttea.tomeofblood.client.renderer.item.TomeRenderer; import com.minttea.tomeofblood.common.utils.BloodSpellResolver; -import net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer; -import net.minecraft.client.settings.KeyBinding; -import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; -import net.minecraft.item.UseAction; -import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.EntityRayTraceResult; import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.network.PacketDistributor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; - -import static com.hollingsworth.arsnouveau.common.items.SpellBook.getMode; -import static com.hollingsworth.arsnouveau.common.items.SpellBook.getUnlockedSpellString; - public class BloodTome extends SpellBook { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/com/minttea/tomeofblood/common/livingarmor/ManaAttribute.java b/src/main/java/com/minttea/tomeofblood/common/livingarmor/ManaAttribute.java deleted file mode 100644 index d846d75..0000000 --- a/src/main/java/com/minttea/tomeofblood/common/livingarmor/ManaAttribute.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.minttea.tomeofblood.common.livingarmor; - -public class ManaAttribute { -} diff --git a/src/main/java/com/minttea/tomeofblood/common/livingarmor/ManaUpgrade.java b/src/main/java/com/minttea/tomeofblood/common/livingarmor/ManaUpgrade.java deleted file mode 100644 index 0137935..0000000 --- a/src/main/java/com/minttea/tomeofblood/common/livingarmor/ManaUpgrade.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.minttea.tomeofblood.common.livingarmor; - -import net.minecraft.util.ResourceLocation; -import wayoftime.bloodmagic.core.living.LivingUpgrade; - -import java.util.List; -import java.util.function.Consumer; - -public class ManaUpgrade extends LivingUpgrade { - public ManaUpgrade(ResourceLocation key, Consumer> experienceMapper) { - super(key, experienceMapper); - - } -} diff --git a/src/main/java/com/minttea/tomeofblood/common/utils/ManaUpgradeHandler.java b/src/main/java/com/minttea/tomeofblood/common/utils/ManaUpgradeHandler.java deleted file mode 100644 index f1d645d..0000000 --- a/src/main/java/com/minttea/tomeofblood/common/utils/ManaUpgradeHandler.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.minttea.tomeofblood.common.utils; - -public class ManaUpgradeHandler { - -} diff --git a/src/main/java/com/minttea/tomeofblood/setup/ItemRegistry.java b/src/main/java/com/minttea/tomeofblood/setup/ItemRegistry.java index 4e91f5c..2882ae3 100644 --- a/src/main/java/com/minttea/tomeofblood/setup/ItemRegistry.java +++ b/src/main/java/com/minttea/tomeofblood/setup/ItemRegistry.java @@ -1,6 +1,5 @@ package com.minttea.tomeofblood.setup; -import com.hollingsworth.arsnouveau.api.spell.ISpellTier; import com.minttea.tomeofblood.TomeOfBloodMod; import com.minttea.tomeofblood.common.items.BloodTome; import net.minecraft.item.Item; diff --git a/src/main/java/com/minttea/tomeofblood/setup/LivingUpgradeRegistry.java b/src/main/java/com/minttea/tomeofblood/setup/LivingUpgradeRegistry.java index 169e182..de37f20 100644 --- a/src/main/java/com/minttea/tomeofblood/setup/LivingUpgradeRegistry.java +++ b/src/main/java/com/minttea/tomeofblood/setup/LivingUpgradeRegistry.java @@ -1,9 +1,6 @@ package com.minttea.tomeofblood.setup; -import com.minttea.tomeofblood.common.livingarmor.ManaUpgrade; import net.minecraft.util.ResourceLocation; -import wayoftime.bloodmagic.common.registration.impl.LivingUpgradeDeferredRegister; -import wayoftime.bloodmagic.common.registration.impl.LivingUpgradeRegistryObject; import wayoftime.bloodmagic.core.LivingArmorRegistrar; import wayoftime.bloodmagic.core.living.LivingUpgrade; diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index c7ddc09..cad1290 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -63,7 +63,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis lacinia magn [[dependencies.tomeofblood]] modId="ars_nouveau" mandatory=true -versionRange="[1.10,)" +versionRange="[1.11,)" ordering="AFTER" side="BOTH" [[dependencies.tomeofblood]]